Accepting request 26268 from Base:System

Copy from Base:System/automake based on submit request 26268 from user psmt OBS-URL: https://build.opensuse.org/request/show/26268 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=17
2009-12-11 16:59:51 +00:00 · 2009-12-11 16:59:51 +00:00 · 4727af9e24
commit 4727af9e24
parent 935f237788
8 changed files with 267 additions and 122 deletions
--- a/automake-1.11.1.tar.bz2
+++ b/automake-1.11.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
+size 1066685
--- a/automake-1.11.tar.bz2
+++ b/automake-1.11.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29aaf27be23559002ac003f539e73c8858cefada2f1ef3f05b6d44f28340aac0
-size 1058759
--- a/automake-11.1-skip-specflg10-without-g++.patch
+++ b/automake-11.1-skip-specflg10-without-g++.patch
@ -1,26 +0,0 @@
-From 639f95c3acd69e47fd2fb43edeb8103c253026fe Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date: Thu, 21 May 2009 17:17:10 +0200
-Subject: [PATCH] Skip specflg10.test without a C++ compiler.
-
-* tests/specflg10.test: Require g++.
-Report by Thien-Thi Nguyen.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
- ChangeLog            |    6 ++++++
- tests/specflg10.test |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-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
- 
-+required=g++
- . ./defs || Exit 1
- 
- set -e
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@ -1,7 +1,7 @@
 Index: lib/config.guess
 ===================================================================
--- lib/config.guess.orig
-+++ lib/config.guess
+--- lib/config.guess.orig	2009-12-08 19:15:40.000000000 +0100
+++ lib/config.guess	2009-12-10 15:24:48.203009436 +0100
@@ -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
@ -19,7 +19,152 @@ Index: lib/config.guess
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -856,13 +866,13 @@ EOF
+@@ -203,19 +213,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:ekkoBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
+     *:SolidBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+ 	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     *:MirBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+ 	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+@@ -280,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo alpha-dec-winnt3.5
+ 	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+-	echo m68k-unknown-sysv4
+	echo m68k-${VENDOR}-sysv4
+ 	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+ 	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-morphos
+	echo ${UNAME_MACHINE}-${VENDOR}-morphos
+ 	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+@@ -301,7 +311,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+     arm:riscos:*:*|arm:RISCOS:*:*)
+-	echo arm-unknown-riscos
+	echo arm-${VENDOR}-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+@@ -409,7 +419,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+         echo m68k-hades-mint${UNAME_RELEASE}
+         exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+         exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+@@ -720,9 +730,9 @@ EOF
+ 	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
+ 	fi
+ 	exit ;;
+     parisc*:Lites*:*:*)
+@@ -782,19 +792,19 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     sparc*:BSD/OS:*:*)
+-	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:BSD/OS:*:*)
+-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+ 	case ${UNAME_MACHINE} in
+ 	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    amd64)
+-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+@@ -816,10 +826,10 @@ EOF
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    authenticamd | genuineintel | EM64T)
+-		echo x86_64-unknown-interix${UNAME_RELEASE}
+		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+-		echo ia64-unknown-interix${UNAME_RELEASE}
+		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+@@ -838,21 +848,21 @@ EOF
+ 	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit ;;
+     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+-	echo x86_64-unknown-cygwin
+	echo x86_64-${VENDOR}-cygwin
+ 	exit ;;
+     p*:CYGWIN*:*)
+-	echo powerpcle-unknown-cygwin
+	echo powerpcle-${VENDOR}-cygwin
+ 	exit ;;
+     prep*:SunOS:5.*:*)
+-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+@@ -869,20 +879,20 @@ 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
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@ -36,13 +181,22 @@ Index: lib/config.guess
 	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-@@ -871,16 +881,16 @@ EOF
+@@ -891,7 +901,7 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
 -    	echo frv-unknown-linux-gnu
 +    	echo frv-${VENDOR}-linux-gnu
 	exit ;;
+     i*86:Linux:*:*)
+ 	LIBC=gnu
+@@ -902,16 +912,16 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
+ 	exit ;;
     ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
@ -55,21 +209,12 @@ Index: lib/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
-     mips:Linux:*:*)
+     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
-@@ -903,7 +913,7 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -926,16 +936,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
+@@ -930,51 +940,51 @@ 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; }
 	;;
@ -77,26 +222,14 @@ Index: lib/config.guess
 -	echo or32-unknown-linux-gnu
 +	echo or32-${VENDOR}-linux-gnu
 	exit ;;
-     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-+	echo powerpc-${VENDOR}-linux-gnu
- 	exit ;;
-     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-${VENDOR}-linux-gnu
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -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
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
- 	exit ;;
     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
-@@ -957,34 +967,34 @@ EOF
+-	echo sparc-unknown-linux-gnu
+	echo sparc-${VENDOR}-linux-gnu
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux-gnu
+ 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@ -108,9 +241,13 @@ Index: lib/config.guess
 +	  *)    echo hppa-${VENDOR}-linux-gnu ;;
 	esac
 	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-+	echo hppa64-${VENDOR}-linux-gnu
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux-gnu
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@ -138,37 +275,9 @@ Index: lib/config.guess
 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -999,15 +1009,15 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
- 		;;
- 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
- 		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
-@@ -1041,7 +1051,7 @@ EOF
- 		p
- 	    }'`"
- 	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
- 		exit
- 	}
- 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-@@ -1066,16 +1076,16 @@ EOF
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -996,16 +1006,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
     i*86:XTS-300:*:STOP)
@ -182,13 +291,13 @@ Index: lib/config.guess
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 -	echo i386-unknown-lynxos${UNAME_RELEASE}
 +	echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1095,7 +1105,7 @@ EOF
+@@ -1025,7 +1035,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
@ -197,7 +306,7 @@ Index: lib/config.guess
 	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
-@@ -1134,7 +1144,7 @@ EOF
+@@ -1064,7 +1074,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.
@ -206,7 +315,7 @@ Index: lib/config.guess
 	fi
 	exit ;;
     mini*:CTIX:SYS*5:*)
-@@ -1171,19 +1181,19 @@ EOF
+@@ -1101,19 +1111,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*:*)
@ -224,13 +333,13 @@ Index: lib/config.guess
 -	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 +	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 -	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 +	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1233,7 +1243,7 @@ EOF
+@@ -1163,7 +1173,7 @@ EOF
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
@ -239,7 +348,7 @@ Index: lib/config.guess
 	fi
         exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1314,13 +1324,13 @@ EOF
+@@ -1254,13 +1264,13 @@ EOF
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
@ -256,7 +365,7 @@ Index: lib/config.guess
 	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-@@ -1329,16 +1339,16 @@ EOF
+@@ -1269,16 +1279,16 @@ EOF
 	echo pdp10-xkl-tops20
 	exit ;;
     *:TOPS-20:*:*)
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Dec 11 16:41:49 CET 2009 - pth@suse.de
+
+- Update to 1.11.1 (bnc#559815):
+
+  - The `parallel-tests' test driver works around a GNU make 3.80
+    bug with trailing white space in the test list
+    (`TESTS = foo $(EMPTY)').
+
+  * Long standing bugs:
+
+  - The testsuite does not try to change the mode of `ltmain.sh'
+    files from a Libtool installation (symlinked to test
+    directories) any more.
+
+  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so
+    that prefixed tools are preferred in a cross-compile setup.
+
+  - The distribution is tarred up with mode 755 now by the
+    `dist*' targets.  This fixes a race condition where untrusted
+    users could modify files in the $(PACKAGE)-$(VERSION) distdir
+    before packing if the toplevel build directory was
+    world-searchable.  This is CVE-2009-4029.
+
+- Make automake a noarch package.
+
+-------------------------------------------------------------------
+Sun Dec  6 18:02:39 CET 2009 - jengelh
+
+- enable parallel building
+
 -------------------------------------------------------------------
 Wed Aug 26 11:27:35 CEST 2009 - coolo@novell.com

@ -686,3 +717,4 @@ Wed Jun 25 11:28:39 MEST 1997 - florian@suse.de
 Fri Aug 23 16:13:49 MET DST 1996 - florian@suse.de

 new version 1.0
+
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@ -1,5 +1,5 @@
 #
-# spec file for package automake-testsuite (Version 1.11)
+# spec file for package automake-testsuite (Version 1.11.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -20,13 +20,13 @@

 Name:           automake-testsuite
 BuildRequires:  bison help2man
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Requires:       autoconf >= 2.62
-Version:        1.11
-Release:        4
+Version:        1.11.1
+Release:        1
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -34,7 +34,7 @@ Source:         automake-%{version}.tar.bz2
 Source1:        automake-rpmlintrc
 Patch1:         automake-SuSE.patch
 Patch3:         automake-require_file.patch
-Patch4:         automake-11.1-skip-specflg10-without-g++.patch
+BuildArch:      noarch

 %description
 Automake is a tool for automatically generating "Makefile.in" files
@ -55,11 +55,10 @@ Authors:
 %setup -q -n automake-%{version}
 %patch1
 %patch3
-%patch4 -p1

 %build
 %configure --docdir=%{_docdir}/%{name}
-make
+make %{?jobs:-j%jobs};
 %if "%{name}" == "automake-testsuite"

 %check
--- a/automake.changes
+++ b/automake.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Dec 11 16:41:49 CET 2009 - pth@suse.de
+
+- Update to 1.11.1 (bnc#559815):
+
+  - The `parallel-tests' test driver works around a GNU make 3.80
+    bug with trailing white space in the test list
+    (`TESTS = foo $(EMPTY)').
+
+  * Long standing bugs:
+
+  - The testsuite does not try to change the mode of `ltmain.sh'
+    files from a Libtool installation (symlinked to test
+    directories) any more.
+
+  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so
+    that prefixed tools are preferred in a cross-compile setup.
+
+  - The distribution is tarred up with mode 755 now by the
+    `dist*' targets.  This fixes a race condition where untrusted
+    users could modify files in the $(PACKAGE)-$(VERSION) distdir
+    before packing if the toplevel build directory was
+    world-searchable.  This is CVE-2009-4029.
+
+- Make automake a noarch package.
+
+-------------------------------------------------------------------
+Sun Dec  6 18:02:39 CET 2009 - jengelh
+
+- enable parallel building
+
 -------------------------------------------------------------------
 Wed Aug 26 11:27:35 CEST 2009 - coolo@novell.com

@ -686,3 +717,4 @@ Wed Jun 25 11:28:39 MEST 1997 - florian@suse.de
 Fri Aug 23 16:13:49 MET DST 1996 - florian@suse.de

 new version 1.0
+
--- a/automake.spec
+++ b/automake.spec
@ -1,5 +1,5 @@
 #
-# spec file for package automake (Version 1.11)
+# spec file for package automake (Version 1.11.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -20,13 +20,13 @@

 Name:           automake
 BuildRequires:  bison help2man
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Requires:       autoconf >= 2.62
-Version:        1.11
-Release:        4
+Version:        1.11.1
+Release:        1
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -34,7 +34,7 @@ Source:         automake-%{version}.tar.bz2
 Source1:        automake-rpmlintrc
 Patch1:         automake-SuSE.patch
 Patch3:         automake-require_file.patch
-Patch4:         automake-11.1-skip-specflg10-without-g++.patch
+BuildArch:      noarch

 %description
 Automake is a tool for automatically generating "Makefile.in" files
@ -55,11 +55,10 @@ Authors:
 %setup -q -n automake-%{version}
 %patch1
 %patch3
-%patch4 -p1

 %build
 %configure --docdir=%{_docdir}/%{name}
-make
+make %{?jobs:-j%jobs};
 %if "%{name}" == "automake-testsuite"

 %check