Attachment 909316 Details for Bug 1106307 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-automake-1.14-1106307.patch (text/plain), 3.12 KB, created by Yaakov Selkowitz on 2014-06-16 23:50:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-16 23:50:10 UTC

Size: 3.12 KB

patch

obsolete

>From 95898f979d5ee73e69d7f348314d85e5ac5c3215 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 16 Jun 2014 18:48:20 -0500
>Subject: [PATCH] Fix FTBFS with automake-1.14 (#1106307)
>
>---
> nmh-1.5-automake.patch | 40 ++++++++++++++++++++++++++++++++++++++++
> nmh.spec               | 10 +++++++---
> 2 files changed, 47 insertions(+), 3 deletions(-)
> create mode 100644 nmh-1.5-automake.patch
>
>diff --git a/nmh-1.5-automake.patch b/nmh-1.5-automake.patch
>new file mode 100644
>index 0000000..b873f80
>--- /dev/null
>+++ b/nmh-1.5-automake.patch
>@@ -0,0 +1,40 @@
>+diff --git a/Makefile.am b/Makefile.am
>+index 9e4e31a..2813a48 100644
>+--- a/Makefile.am
>++++ b/Makefile.am
>+@@ -86,11 +86,6 @@ clean-local:
>+ 	@rm -rf test/testdir
>+ 
>+ ##
>+-## Stuff that should be cleaned via "make maintainer-clean"
>+-##
>+-MAINTAINERCLEANFILES = cscope.files cscope.out
>+-
>+-##
>+ ## And our own superclean, to get everything left by maintainer-clean.
>+ ##
>+ SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
>+@@ -576,10 +571,7 @@ rpm: dist
>+ ##
>+ ## A target to build information needed by cscope
>+ ##
>+-cscope:
>+-	echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
>+-	find $(srcdir) $ -name docs -prune $ -o $ -name \*.c -o -name \*.l $ -print | grep -v dtimep.c >> cscope.files
>+-.PHONY: cscope
>++AM_CSCOPEFLAGS = -I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp
>+ 
>+ 
>+ ##
>+diff --git a/configure.ac b/configure.ac
>+index 70490ca..c149407 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -153,6 +153,7 @@ fi
>+ 
>+ AC_PROG_CC
>+ AM_PROG_CC_C_O
>++AM_PROG_AR
>+ 
>+ AC_CACHE_CHECK([whether preprocessor supports -Wunused-macros],
>+   [nmh_cv_has_unusedmacros],
>diff --git a/nmh.spec b/nmh.spec
>index 88a2fa1..c9e4b20 100644
>--- a/nmh.spec
>+++ b/nmh.spec
>@@ -1,6 +1,6 @@
> Name:           nmh
> Version:        1.5
>-Release:        9%{?dist}
>+Release:        10%{?dist}
> Summary:        A capable mail handling system with a command line interface.
> 
> Group:          Applications/Internet
>@@ -10,11 +10,11 @@ Source0:        nmh-1.5.tar.gz
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  ncurses-devel
> BuildRequires:  libdb-devel
>-BuildRequires:  automake
>+BuildRequires:  autoconf automake
> BuildRequires:  /usr/sbin/sendmail
> BuildRequires:  /bin/vi
> 
>-Patch0:         nmh-autoconf-2_69.patch
>+Patch0:         nmh-1.5-automake.patch
> 
> %description
> Nmh is an email system based on the MH email system and is intended to
>@@ -30,6 +30,7 @@ interface for it--nmh only has a command line interface.
> %prep
> %setup -q -n nmh-1.5
> %patch0 -p1
>+autoreconf -fiv
> 
> %build
> CFLAGS="$RPM_OPT_FLAGS -fno-builtin-strcasecmp"
>@@ -57,6 +58,9 @@ chmod g-s $RPM_BUILD_ROOT/%{_bindir}/inc
> %doc %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
> 
> %changelog
>+* Mon Jun 16 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0:1.5-10
>+- Fix FTBFS with automake-1.14 (#1106307)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-9
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106307: 904480 | 904481 | 904482 | 909316