[recode] Fix building with new automake
Zoltan Kota
zkota at fedoraproject.org
Mon Jul 23 13:20:02 UTC 2012
commit 53f9b7aab6f5759f1b0510dccf5c34344c230e65
Author: Zoltan Kota <zoltank at gmail.com>
Date: Mon Jul 23 15:19:44 2012 +0200
Fix building with new automake
recode-automake.patch | 22 ++++++++++++++++++++++
recode.spec | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/recode-automake.patch b/recode-automake.patch
new file mode 100644
index 0000000..d0916c8
--- /dev/null
+++ b/recode-automake.patch
@@ -0,0 +1,22 @@
+--- recode-3.6.orig/configure.in 2001-01-03 16:50:54.000000000 +0100
++++ recode-3.6/configure.in 2012-07-23 14:15:28.000000000 +0200
+@@ -15,7 +15,7 @@
+ AM_PROG_LIBTOOL
+
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
++dnl AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+ ad_AC_PROG_FLEX
+--- recode-3.6.orig/src/Makefile.am 2000-12-06 17:36:12.000000000 +0100
++++ recode-3.6/src/Makefile.am 2012-07-23 14:47:07.000000000 +0200
+@@ -17,7 +17,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+-AUTOMAKE_OPTIONS = gnits ansi2knr
++AUTOMAKE_OPTIONS = gnits
+ bin_PROGRAMS = recode
+ lib_LTLIBRARIES = librecode.la
+ man_MANS = recode.1
diff --git a/recode.spec b/recode.spec
index ad1eede..fcacf6c 100644
--- a/recode.spec
+++ b/recode.spec
@@ -1,7 +1,7 @@
Summary: Conversion between character sets and surfaces
Name: recode
Version: 3.6
-Release: 33%{?dist}
+Release: 34%{?dist}
License: GPLv2+
Group: Applications/File
Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
@@ -9,6 +9,7 @@ Patch0: recode.patch
Patch1: recode-3.6-getcwd.patch
Patch2: recode-bool-bitfield.patch
Patch3: recode-flex-m4.patch
+Patch4: recode-automake.patch
Url: http://recode.progiciels-bpi.ca/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +48,7 @@ are supported.
%patch1 -p1 -b .getcwd
%patch2 -p0
%patch3 -p1
+%patch4 -p1
rm m4/libtool.m4
rm acinclude.m4
@@ -99,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/*
%changelog
+* Mon Jul 23 2012 Zoltan Kota <zoltank[AT]gmail.com> 3.6-34
+- Add patch for fixing build with new automake.
+ (Fixes failed Fedora_18_Mass_Rebuild.)
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list