[golly] Add patch to avoid automake problem.

Eric Smith brouhaha at fedoraproject.org
Mon Jun 10 20:47:32 UTC 2013


commit 1a175b3d637d28d348a400f71d19722fc28c1e54
Author: Eric Smith <brouhaha at fedoraproject.org>
Date:   Mon Jun 10 14:47:23 2013 -0600

    Add patch to avoid automake problem.

 golly-2.4-automake.patch |   11 +++++++++++
 golly.spec               |   12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/golly-2.4-automake.patch b/golly-2.4-automake.patch
new file mode 100644
index 0000000..e9cfc24
--- /dev/null
+++ b/golly-2.4-automake.patch
@@ -0,0 +1,11 @@
+diff -up golly-2.4-src/configure.ac.automake golly-2.4-src/configure.ac
+--- golly-2.4-src/configure.ac.automake	2013-06-10 14:39:43.081609663 -0600
++++ golly-2.4-src/configure.ac	2013-06-10 14:40:07.062052108 -0600
+@@ -23,6 +23,7 @@ AC_PROG_GREP
+ AC_PROG_EGREP
+ AC_PROG_SED
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_CXX
+ AC_CHECK_TOOL([OBJDUMP], [objdump])
+ AS_IF([test "x$OBJDUMP" = x], [AC_MSG_ERROR([missing objdump])])
diff --git a/golly.spec b/golly.spec
index ae93e18..3bec0da 100644
--- a/golly.spec
+++ b/golly.spec
@@ -1,6 +1,6 @@
 Name:		golly
 Version:	2.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Cellular automata simulator (includes Conway's Game of Life)
 Group:		Amusements/Games
 # The license for the code is GPLv2+
@@ -20,6 +20,10 @@ Source1:	http://www.argentum.freeserve.co.uk/lex_home.htm
 # patch to use %{_datadir}/%{name} for supplied files, rather than current dir
 Patch0:		golly-appdir.patch
 
+# patch to avoid error in automake
+Patch1:		golly-2.4-automake.patch
+
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	wxGTK-devel
 BuildRequires:	perl-devel perl-ExtUtils-Embed
@@ -57,6 +61,7 @@ Development files for Golly celluar automata simulator.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch -P 0 -p1 -b .appdir
+%patch -P 1 -p1 -b .automake
 
 cp %{SOURCE1} .
 
@@ -69,7 +74,7 @@ find . -name '.#*' -exec rm {} \;
 find . -type f -exec chmod 644 {} \;
 
 chmod +x configure
-autoreconf --force
+autoreconf --force --install
 
 %build
 %configure
@@ -132,6 +137,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 10 2013 Eric Smith <brouhaha at fedoraproject.org> 2.4-7
+- Add patch to avoid error in automake.
+
 * Mon Apr 29 2013 Eric Smith <eric at brouhaha.com> 2.4-6
 - Add use of configure, necessary for autoreconf to actually do anything
   useful.


More information about the scm-commits mailing list