From 5d72b8d9f44b6a4d58d77145a4c9d91fd60e7cacc43b2936730cd90ceed7b17f Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 17 Jun 2013 11:45:26 +0000 Subject: [PATCH] - Update to 1.13.4: - Fix a minor regression introduced in Automake 1.13.3: when two or more user-defined suffix rules were present in a single Makefile.am, automake would needlessly include definition of some make variables related to C compilation in the generated Makefile.in (bug#14560). - Patches updated to they apply cleanly and with no offset. - Update to 1.13.4: - Fix a minor regression introduced in Automake 1.13.3: when two or more user-defined suffix rules were present in a single Makefile.am, automake would needlessly include definition of some make variables related to C compilation in the generated Makefile.in (bug#14560). OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=35 --- automake-1.13.3.tar.xz | 3 --- automake-1.13.4.tar.xz | 3 +++ automake-SuSE.patch | 36 ++++++++++++++++++++++-------------- automake-testsuite.changes | 11 +++++++++++ automake-testsuite.spec | 2 +- automake.changes | 9 +++++++++ automake.spec | 2 +- 7 files changed, 47 insertions(+), 19 deletions(-) delete mode 100644 automake-1.13.3.tar.xz create mode 100644 automake-1.13.4.tar.xz diff --git a/automake-1.13.3.tar.xz b/automake-1.13.3.tar.xz deleted file mode 100644 index 6c3c6cf..0000000 --- a/automake-1.13.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81f9d396081b8c83eb054b468ce6e4f7000a4a97c17956c315decfa830913724 -size 1448176 diff --git a/automake-1.13.4.tar.xz b/automake-1.13.4.tar.xz new file mode 100644 index 0000000..e88fd82 --- /dev/null +++ b/automake-1.13.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89ce4933f59b8f0c20115c39cfe450a595cca74ede27b6881e88ec27720d1d66 +size 1449608 diff --git a/automake-SuSE.patch b/automake-SuSE.patch index 1532103..ccae5f8 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,11 +1,11 @@ --- - lib/config.guess | 152 +++++++++++++++++++++++++++++-------------------------- - 1 file changed, 81 insertions(+), 71 deletions(-) + lib/config.guess | 156 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 83 insertions(+), 73 deletions(-) Index: lib/config.guess =================================================================== ---- lib/config.guess.orig 2013-05-30 23:06:07.000000000 +0200 -+++ lib/config.guess 2013-06-12 15:02:45.505846755 +0200 +--- lib/config.guess.orig 2013-06-14 14:32:52.000000000 +0200 ++++ lib/config.guess 2013-06-17 13:43:12.656255639 +0200 @@ -153,6 +153,16 @@ Linux|GNU|GNU/*) ;; esac @@ -239,7 +239,7 @@ Index: lib/config.guess exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -967,57 +977,57 @@ EOF +@@ -967,63 +977,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` @@ -281,6 +281,14 @@ Index: lib/config.guess - echo powerpc-unknown-linux-${LIBC} + echo powerpc-${VENDOR}-linux-${LIBC} exit ;; + ppc64le:Linux:*:*) +- echo powerpc64le-unknown-linux-${LIBC} ++ echo powerpc64le-${VENDOR}-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) +- echo powerpcle-unknown-linux-${LIBC} ++ echo powerpcle-${VENDOR}-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -313,7 +321,7 @@ Index: lib/config.guess exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1039,16 +1049,16 @@ EOF +@@ -1045,16 +1055,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -333,7 +341,7 @@ Index: lib/config.guess exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1068,7 +1078,7 @@ EOF +@@ -1074,7 +1084,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -342,7 +350,7 @@ Index: lib/config.guess exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1107,7 +1117,7 @@ EOF +@@ -1113,7 +1123,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. @@ -351,7 +359,7 @@ Index: lib/config.guess fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1144,19 +1154,19 @@ EOF +@@ -1150,19 +1160,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*:*) @@ -375,7 +383,7 @@ Index: lib/config.guess exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1206,7 +1216,7 @@ EOF +@@ -1212,7 +1222,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -384,7 +392,7 @@ Index: lib/config.guess fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1222,7 +1232,7 @@ EOF +@@ -1228,7 +1238,7 @@ EOF echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) @@ -393,7 +401,7 @@ Index: lib/config.guess exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} -@@ -1305,13 +1315,13 @@ EOF +@@ -1311,13 +1321,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -410,7 +418,7 @@ Index: lib/config.guess exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1320,16 +1330,16 @@ EOF +@@ -1326,16 +1336,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -430,7 +438,7 @@ Index: lib/config.guess exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1351,7 +1361,7 @@ EOF +@@ -1357,7 +1367,7 @@ EOF echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 804cdef..39387c4 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de + +- Update to 1.13.4: + - Fix a minor regression introduced in Automake 1.13.3: when two or more + user-defined suffix rules were present in a single Makefile.am, + automake would needlessly include definition of some make variables + related to C compilation in the generated Makefile.in (bug#14560). + ------------------------------------------------------------------- Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de @@ -30,6 +39,8 @@ Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de - Some other minor miscellaneous changes and fixlets. + - Patches updated to they apply cleanly and with no offset. + ------------------------------------------------------------------- Tue May 28 14:21:04 CEST 2013 - pth@suse.de diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 3870857..edf610b 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -34,7 +34,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.3 +Version: 1.13.4 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ diff --git a/automake.changes b/automake.changes index 9c3589f..39387c4 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de + +- Update to 1.13.4: + - Fix a minor regression introduced in Automake 1.13.3: when two or more + user-defined suffix rules were present in a single Makefile.am, + automake would needlessly include definition of some make variables + related to C compilation in the generated Makefile.in (bug#14560). + ------------------------------------------------------------------- Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de diff --git a/automake.spec b/automake.spec index 80f2ee3..9a61af0 100644 --- a/automake.spec +++ b/automake.spec @@ -34,7 +34,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.3 +Version: 1.13.4 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+