diff --git a/automake-1.13.1.tar.xz b/automake-1.13.1.tar.xz deleted file mode 100644 index 7ce74c5..0000000 --- a/automake-1.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ecd6cf682e78e833361264263f0f9496949bfbae7f8366bc327de38ff0ad18b -size 1425080 diff --git a/automake-1.13.2.tar.xz b/automake-1.13.2.tar.xz new file mode 100644 index 0000000..069710b --- /dev/null +++ b/automake-1.13.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80692147333399def4116ac1967e92fea9dd26f28670a36600efc2755648a646 +size 1439596 diff --git a/automake-SuSE.patch b/automake-SuSE.patch index 10618d7..3958d03 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -1,8 +1,12 @@ +--- + lib/config.guess | 148 +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 79 insertions(+), 69 deletions(-) + Index: lib/config.guess =================================================================== ---- lib/config.guess.orig -+++ lib/config.guess -@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | +--- lib/config.guess.orig 2013-05-13 22:12:48.000000000 +0200 ++++ lib/config.guess 2013-05-27 15:26:41.399249532 +0200 +@@ -132,6 +132,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 @@ -19,7 +23,7 @@ Index: lib/config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -200,23 +210,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -196,23 +206,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -49,7 +53,7 @@ Index: lib/config.guess exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in -@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -280,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo alpha-dec-winnt3.5 exit ;; Amiga*:UNIX_System_V:4.0:*) @@ -66,7 +70,7 @@ Index: lib/config.guess exit ;; *:OS/390:*:*) echo i370-ibm-openedition -@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -301,7 +311,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) @@ -75,7 +79,7 @@ Index: lib/config.guess exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp -@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ +@@ -409,7 +419,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -84,7 +88,7 @@ Index: lib/config.guess exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} -@@ -724,9 +734,9 @@ EOF +@@ -720,9 +730,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then @@ -96,7 +100,7 @@ Index: lib/config.guess fi exit ;; parisc*:Lites*:*:*) -@@ -786,18 +796,18 @@ EOF +@@ -782,18 +792,18 @@ EOF echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) @@ -119,7 +123,7 @@ Index: lib/config.guess esac exit ;; i*:CYGWIN*:*) -@@ -825,10 +835,10 @@ EOF +@@ -821,10 +831,10 @@ EOF echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) @@ -132,7 +136,7 @@ Index: lib/config.guess exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -847,31 +857,31 @@ EOF +@@ -843,31 +853,31 @@ EOF echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) @@ -171,15 +175,16 @@ Index: lib/config.guess exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -885,26 +895,26 @@ EOF +@@ -881,7 +891,7 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -891,19 +901,19 @@ EOF if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -203,7 +208,7 @@ Index: lib/config.guess exit ;; cris:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-gnu -@@ -913,10 +923,10 @@ EOF +@@ -912,10 +922,10 @@ EOF echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) @@ -216,7 +221,7 @@ Index: lib/config.guess exit ;; i*86:Linux:*:*) LIBC=gnu -@@ -930,13 +940,13 @@ EOF +@@ -934,13 +944,13 @@ EOF echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) @@ -233,13 +238,17 @@ Index: lib/config.guess exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -955,54 +965,54 @@ EOF +@@ -959,48 +969,48 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } ;; + or1k:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu @@ -292,10 +301,8 @@ Index: lib/config.guess exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu +@@ -1011,7 +1021,7 @@ EOF + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -303,7 +310,7 @@ Index: lib/config.guess exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1024,16 +1034,16 @@ EOF +@@ -1033,16 +1043,16 @@ EOF echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) @@ -323,7 +330,7 @@ Index: lib/config.guess exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1053,7 +1063,7 @@ EOF +@@ -1062,7 +1072,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -332,7 +339,7 @@ Index: lib/config.guess exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1092,7 +1102,7 @@ EOF +@@ -1101,7 +1111,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. @@ -341,7 +348,7 @@ Index: lib/config.guess fi exit ;; mini*:CTIX:SYS*5:*) -@@ -1129,19 +1139,19 @@ EOF +@@ -1138,19 +1148,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*:*) @@ -365,7 +372,7 @@ Index: lib/config.guess exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} -@@ -1191,7 +1201,7 @@ EOF +@@ -1200,7 +1210,7 @@ EOF if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -374,7 +381,7 @@ Index: lib/config.guess fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1207,7 +1217,7 @@ EOF +@@ -1216,7 +1226,7 @@ EOF echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) @@ -383,7 +390,7 @@ Index: lib/config.guess exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} -@@ -1288,13 +1298,13 @@ EOF +@@ -1297,13 +1307,13 @@ EOF else UNAME_MACHINE="$cputype" fi @@ -400,7 +407,7 @@ Index: lib/config.guess exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 -@@ -1303,16 +1313,16 @@ EOF +@@ -1312,16 +1322,16 @@ EOF echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) @@ -420,7 +427,7 @@ Index: lib/config.guess exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1334,7 +1344,7 @@ EOF +@@ -1343,7 +1353,7 @@ EOF echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) diff --git a/automake-testsuite.changes b/automake-testsuite.changes index b87118f..e699ee9 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Mon May 27 15:28:36 CEST 2013 - pth@suse.de + +- Update to 1.13.2 (for the full change log please see the file NEWS + in the package documentation): + +* Obsolescent features: + + - Use of suffix-less info files (that can be specified through the + '@setfilename' macro in Texinfo input files) is discouraged, and + its use will raise warnings in the 'obsolete' category. + + - Use of Texinfo input files with '.txi' or '.texinfo' extensions + is discouraged, and its use will raise warnings in the 'obsolete' + category. You are advised to simply use the '.texi' extension + instead. + +* Documentation fixes: + + - The long-deprecated but still supported two-arguments invocation form + of AM_INIT_AUTOMAKE is documented once again. + +* Bugs fixed: + + - When the 'ustar' option is used, the generated configure script no + longer risks hanging during the tests for the availability of the + 'pax' utility, even if the user running configure has a UID or GID + that requires more than 21 bits to be represented. + + - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once + again, as they did in Automake 1.12.x (albeit printing runtime + warnings in the 'obsolete' category). + + - aclocal will no longer error out if the first local m4 directory + (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or + 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report + a warning in the 'unsupported' category. + + - aclocal will no longer consider directories for extra m4 files more + than once, even if they are specified multiple times. + + - Analysis of make flags in Automake-generated rules has been made more + robust, and more future-proof. +- Adapt automake-SUSE.patch to the changed sources. + ------------------------------------------------------------------- Mon Apr 29 07:55:39 UTC 2013 - mmeister@suse.com diff --git a/automake-testsuite.spec b/automake-testsuite.spec index ac11261..7f656b6 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.1 +Version: 1.13.2 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 b87118f..353e362 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Mon May 27 15:28:36 CEST 2013 - pth@suse.de + +- Update to 1.13.2 (for the full change log please see the file NEWS + in the package documentation): + +* Obsolescent features: + + - Use of suffix-less info files (that can be specified through the + '@setfilename' macro in Texinfo input files) is discouraged, and + its use will raise warnings in the 'obsolete' category. + + - Use of Texinfo input files with '.txi' or '.texinfo' extensions + is discouraged, and its use will raise warnings in the 'obsolete' + category. You are advised to simply use the '.texi' extension + instead. + +* Documentation fixes: + + - The long-deprecated but still supported two-arguments invocation form + of AM_INIT_AUTOMAKE is documented once again. + +* Bugs fixed: + + - When the 'ustar' option is used, the generated configure script no + longer risks hanging during the tests for the availability of the + 'pax' utility, even if the user running configure has a UID or GID + that requires more than 21 bits to be represented. + + - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once + again, as they did in Automake 1.12.x (albeit printing runtime + warnings in the 'obsolete' category). + + - aclocal will no longer error out if the first local m4 directory + (as specified by the '-I' option or the 'AC_CONFIG_MACRO_DIRS' or + 'AC_CONFIG_MACRO_DIR' macros) doesn't exist; it will merely report + a warning in the 'unsupported' category. + + - aclocal will no longer consider directories for extra m4 files more + than once, even if they are specified multiple times. + + - Analysis of make flags in Automake-generated rules has been made more + robust, and more future-proof. + +- Adapt automake-SUSE.patch to the changed sources. + ------------------------------------------------------------------- Mon Apr 29 07:55:39 UTC 2013 - mmeister@suse.com diff --git a/automake.spec b/automake.spec index 5dd12c6..9791373 100644 --- a/automake.spec +++ b/automake.spec @@ -34,7 +34,7 @@ Requires: flex %endif Requires: autoconf >= 2.69 Requires: info -Version: 1.13.1 +Version: 1.13.2 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files License: GPL-2.0+ diff --git a/pre_checkin.sh b/pre_checkin.sh index f311f96..cf106b0 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,5 +1,6 @@ #!/bin/bash -# This script is called automatically during autobuild checkin. +# This script has to be run prior to a check-in if changes were done +# to spec and/or changes sed -e "s,^\(Name:.*automake\),\1-testsuite," automake.spec > automake-testsuite.spec cp automake.changes automake-testsuite.changes