diff --git a/automake-11.1-skip-specflg10-without-g++.patch b/automake-11.1-skip-specflg10-without-g++.patch index 8827b7c..a7db8a0 100644 --- a/automake-11.1-skip-specflg10-without-g++.patch +++ b/automake-11.1-skip-specflg10-without-g++.patch @@ -12,10 +12,10 @@ Signed-off-by: Ralf Wildenhues tests/specflg10.test | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) -diff --git a/tests/specflg10.test b/tests/specflg10.test -index 98be12a..efe13f5 100755 ---- a/tests/specflg10.test -+++ b/tests/specflg10.test +Index: automake-1.11/tests/specflg10.test +=================================================================== +--- automake-1.11.orig/tests/specflg10.test ++++ automake-1.11/tests/specflg10.test @@ -16,6 +16,7 @@ # AM_DEFAULT_SOURCE_EXT @@ -24,6 +24,3 @@ index 98be12a..efe13f5 100755 . ./defs || Exit 1 set -e --- -1.6.3 - diff --git a/automake-SuSE.patch b/automake-SuSE.patch index c62002e..06a7af4 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,6 +1,8 @@ ---- lib/config.guess +Index: lib/config.guess +=================================================================== +--- lib/config.guess.orig +++ lib/config.guess -@@ -139,6 +139,16 @@ +@@ -139,6 +139,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -17,7 +19,7 @@ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -853,13 +863,13 @@ +@@ -856,13 +866,13 @@ EOF if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -34,7 +36,7 @@ exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu -@@ -868,16 +878,16 @@ +@@ -871,16 +881,16 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -55,7 +57,7 @@ exit ;; mips:Linux:*:*) eval $set_cc_for_build -@@ -900,7 +910,7 @@ +@@ -903,7 +913,7 @@ EOF s: ::g p }'`" @@ -64,7 +66,7 @@ ;; mips64:Linux:*:*) eval $set_cc_for_build -@@ -923,16 +933,16 @@ +@@ -926,16 +936,16 @@ EOF s: ::g p }'`" @@ -85,7 +87,7 @@ exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -946,7 +956,7 @@ +@@ -949,7 +959,7 @@ EOF esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -94,7 +96,7 @@ exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu -@@ -954,34 +964,34 @@ +@@ -957,34 +967,34 @@ EOF parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -138,7 +140,7 @@ exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -996,15 +1006,15 @@ +@@ -999,15 +1009,15 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) @@ -157,7 +159,7 @@ exit ;; esac # Determine whether the default compiler is a.out or elf -@@ -1038,7 +1048,7 @@ +@@ -1041,7 +1051,7 @@ EOF p }'`" test x"${LIBC}" != x && { @@ -166,7 +168,7 @@ exit } test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -@@ -1063,16 +1073,16 @@ +@@ -1066,16 +1076,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -186,7 +188,7 @@ exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1092,7 +1102,7 @@ +@@ -1095,7 +1105,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -195,7 +197,7 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1128,7 +1138,7 @@ +@@ -1134,7 +1144,7 @@ EOF if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. @@ -204,9 +206,9 @@ fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1155,19 +1165,19 @@ - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; +@@ -1171,19 +1181,19 @@ EOF + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} @@ -228,7 +230,7 @@ exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1217,7 +1227,7 @@ +@@ -1233,7 +1243,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -237,7 +239,7 @@ fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1298,13 +1308,13 @@ +@@ -1314,13 +1324,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -254,7 +256,7 @@ exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1313,16 +1323,16 @@ +@@ -1329,16 +1339,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) diff --git a/automake-require_file.patch b/automake-require_file.patch index 3d8bfab..e922ab7 100644 --- a/automake-require_file.patch +++ b/automake-require_file.patch @@ -1,6 +1,8 @@ ---- automake.in +Index: automake.in +=================================================================== +--- automake.in.orig +++ automake.in -@@ -7146,12 +7146,14 @@ +@@ -7768,12 +7768,14 @@ sub require_file_internal ($$$@) my $fullfile = "$dir/$file"; my $found_it = 0; my $dangling_sym = 0; diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 429fb50..e410ace 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 26 11:27:35 CEST 2009 - coolo@novell.com + +- rediff to avoid fuzz + ------------------------------------------------------------------- Fri Jul 10 19:37:24 UTC 2009 - jansimon.moeller@opensuse.org diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 3b1db60..99c7b57 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -26,7 +26,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Requires: autoconf >= 2.62 Version: 1.11 -Release: 3 +Release: 4 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/automake.changes b/automake.changes index 429fb50..e410ace 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 26 11:27:35 CEST 2009 - coolo@novell.com + +- rediff to avoid fuzz + ------------------------------------------------------------------- Fri Jul 10 19:37:24 UTC 2009 - jansimon.moeller@opensuse.org diff --git a/automake.spec b/automake.spec index 1a9c4bf..7ddcb1a 100644 --- a/automake.spec +++ b/automake.spec @@ -26,7 +26,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Requires: autoconf >= 2.62 Version: 1.11 -Release: 3 +Release: 4 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build