From 3fcaa2bfbbdbf7f839b1461c061708b8af27951780ef1acdc9b007841988530a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 30 Apr 2009 21:45:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=11 --- automake-fix_check10.patch | 24 ++++++++++++++++++++++++ automake-require_file.patch | 2 +- automake.changes | 14 +++++++++++++- automake.spec | 16 ++++++++++++---- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 automake-fix_check10.patch diff --git a/automake-fix_check10.patch b/automake-fix_check10.patch new file mode 100644 index 0000000..55905da --- /dev/null +++ b/automake-fix_check10.patch @@ -0,0 +1,24 @@ +commit 319305db77dfdcbba3d5a1703c781750affdb20a +Author: Ralf Wildenhues +Date: Wed Nov 12 07:07:31 2008 +0100 + + Testsuite fix for ksh. + + * tests/check10.test: Add ':' as last command in subshell, for + zero exit status of the subshell. + Missing backport from master reported by Tim Rice. + + Signed-off-by: Ralf Wildenhues + +diff --git a/tests/check10.test b/tests/check10.test +index 1332765..1689255 100755 +--- a/tests/check10.test ++++ b/tests/check10.test +@@ -72,6 +72,7 @@ unset TESTS || : + env TESTS="xpass xpass2" $MAKE -e check + env TESTS='pass skip xfail' $MAKE -e check + $MAKE check ++ : + ) >stdout + cat stdout + diff --git a/automake-require_file.patch b/automake-require_file.patch index ebcc78d..3d8bfab 100644 --- a/automake-require_file.patch +++ b/automake-require_file.patch @@ -1,6 +1,6 @@ --- automake.in +++ automake.in -@@ -6836,12 +6836,14 @@ +@@ -7146,12 +7146,14 @@ my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0; diff --git a/automake.changes b/automake.changes index 4959c25..84edd2f 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Apr 30 12:59:21 CEST 2009 - pth@suse.de + +- Add upstream post 1.10.2 patch to fix the failing check10.test. + +------------------------------------------------------------------- +Wed Apr 29 15:07:20 CEST 2009 - pth@suse.de + +- Rediff to sync the patches (automake-require_file.patch was off + by ~ 500 lines). Update the reference to bugzilla for this patch. + ------------------------------------------------------------------- Wed Mar 11 15:02:32 CET 2009 - pth@suse.de @@ -258,7 +269,8 @@ Sun Feb 13 14:50:56 CET 2005 - schwab@suse.de ------------------------------------------------------------------- Fri Jan 14 16:57:30 CET 2005 - schwab@suse.de -- Fix require_file_internal to handle file names with directories [#49822]. +- Fix require_file_internal to handle file names with directories + (bnc#64822). ------------------------------------------------------------------- Wed Jan 12 14:30:56 CET 2005 - schwab@suse.de diff --git a/automake.spec b/automake.spec index 95b801d..d8e6acf 100644 --- a/automake.spec +++ b/automake.spec @@ -26,7 +26,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Requires: autoconf >= 2.60 Version: 1.10.2 -Release: 1 +Release: 2 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,6 +34,7 @@ Source: automake-%{version}.tar.bz2 Source1: automake-rpmlintrc Patch1: automake-SuSE.patch Patch3: automake-require_file.patch +Patch4: automake-fix_check10.patch %description Automake is a tool for automatically generating "Makefile.in" files @@ -54,6 +55,7 @@ Authors: %setup -q %patch1 %patch3 +%patch4 -p1 %build %configure --docdir=%{_docdir}/%{name} @@ -95,6 +97,11 @@ rm -rf %{buildroot} %config /etc/aclocal_dirlist %changelog +* Thu Apr 30 2009 pth@suse.de +- Add upstream post 1.10.2 patch to fix the failing check10.test. +* Wed Apr 29 2009 pth@suse.de +- Rediff to sync the patches (automake-require_file.patch was off + by ~ 500 lines). Update the reference to bugzilla for this patch. * Wed Mar 11 2009 pth@suse.de - Update to 1.10.2: * Rebuild rules now also work for a removed `subdir/Makefile.in' in @@ -299,14 +306,15 @@ rm -rf %{buildroot} * Sun Feb 13 2005 schwab@suse.de - Update to automake 1.9.5. * Fri Jan 14 2005 schwab@suse.de -- Fix require_file_internal to handle file names with directories [#49822]. +- Fix require_file_internal to handle file names with directories + (bnc#64822). * Wed Jan 12 2005 schwab@suse.de - Update to automake 1.9.4. * Thu Nov 25 2004 ro@suse.de - incremental fix for py-compile * Fri Nov 19 2004 schwab@suse.de - Fix py-compile to avoid putting $(DESTDIR) in the output. -* Mon Nov 01 2004 schwab@suse.de +* Tue Nov 02 2004 schwab@suse.de - Update to automake 1.9.3. * Fri Oct 08 2004 schwab@suse.de - Update to automake 1.9.2. @@ -428,7 +436,7 @@ rm -rf %{buildroot} - Use vendor within config.sub even for s390 * Mon May 01 2000 kukuk@suse.de - Use mandir und infodir macro -* Wed Mar 29 2000 bk@suse.de +* Thu Mar 30 2000 bk@suse.de - updated config.guess and config.sub for s390 * Wed Mar 01 2000 werner@suse.de - Add arm/ppc patch from teTeX sources