From 96b04521684b54c9414e3c04414b6263b3f3e0faf62834329fe0a77e3b772381 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 29 May 2012 14:29:55 +0000 Subject: [PATCH] Accepting request 122728 from home:puzel:branches:Base:System - fix build with automake-1.12 - add: automake-1.12.patch OBS-URL: https://build.opensuse.org/request/show/122728 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=31 --- automake-1.12.patch | 13 +++++++++++++ findutils.changes | 6 ++++++ findutils.spec | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch new file mode 100644 index 0000000..04d4bff --- /dev/null +++ b/automake-1.12.patch @@ -0,0 +1,13 @@ +Index: findutils-4.5.10/configure.ac +=================================================================== +--- findutils-4.5.10.orig/configure.ac ++++ findutils-4.5.10/configure.ac +@@ -77,8 +77,6 @@ AC_PROG_CPP + dnl for gnulib + gl_EARLY + +-AM_C_PROTOTYPES +- + AC_PROG_INSTALL + AC_PROG_RANLIB + dnl AC_PROG_LIBTOOL diff --git a/findutils.changes b/findutils.changes index 1744318..d54bdbb 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 29 11:29:27 UTC 2012 - puzel@suse.com + +- fix build with automake-1.12 + - add: automake-1.12.patch + ------------------------------------------------------------------- Mon Feb 13 14:19:23 CET 2012 - pth@suse.de diff --git a/findutils.spec b/findutils.spec index 54054e6..387ac85 100644 --- a/findutils.spec +++ b/findutils.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: findutils Url: http://www.gnu.org/software/findutils/ Version: 4.5.10 @@ -34,6 +35,7 @@ Patch1: findutils-4.4.2-xautofs.patch Patch2: findutils-4.4.2-updatedb.patch Patch3: findutils-4.5.10-prune_unknown.patch Patch4: findutils-4.5.10-updatedb_ignore_nfsv4.patch +Patch5: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake %if 0%{?suse_version} > 1100 @@ -62,7 +64,8 @@ Summary: Tool for Locating Files (findutils subpackage) Group: Productivity/File utilities Provides: findutils:/usr/bin/locate PreReq: %{fillup_prereq} -Requires: cron findutils = %{version} +Requires: cron +Requires: findutils = %{version} %description locate This package contains the locate program which is part of the GNU @@ -80,6 +83,7 @@ switching on the computer. %patch2 %patch3 %patch4 +%patch5 -p1 %build autoreconf