From 488b7b2e08f574156de76db42d63fd49417bf79832cfc34ba72ed00e0f477e47 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Wed, 12 Jun 2013 13:24:56 +0000
Subject: [PATCH 1/3] - Update to 1.13.3:   * Documentation fixes:     - The
 documentation no longer mistakenly reports that the       obsolete
 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable       are going to be
 removed in Automake 2.0.   * Bugs fixed:     - Byte-compilation of Emacs lisp
 files could fail spuriously on       Solaris, when /bin/ksh or
 /usr/xpg4/bin/sh were used as shell.     - If the same user-defined suffixes
 were transformed into       different Automake-known suffixes in different
 Makefile.am       files in the same project, automake could get confused and 
      generate inconsistent Makefiles (automake bug#14441).       For example,
 if 'Makefile.am' contained a ".ext.cc:" suffix       rule, and
 'sub/Makefile.am' contained a ".ext.c:" suffix rule,       automake would
 have mistakenly placed into 'Makefile.in' rules       to compile "*.c" files
 into object files, and into       'sub/Makefile.in' rules to compile "*.cc"
 files into object       files --- rather than the other way around.  This is
 now fixed.   - Several spurious failures have been fixed (they hit especially
     MinGW/MSYS builds).  See automake bugs #14493, #14494, #14495,    
 #14498, #14499, #14500, #14501, #14517 and #14528.   - Some other minor
 miscellaneous changes and fixlets.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=34
---
 automake-1.13.2.tar.xz      |   3 -
 automake-1.13.3.tar.xz      |   3 +
 automake-SuSE.patch         | 197 ++++++++++++++++++------------------
 automake-require_file.patch |  10 +-
 automake-testsuite.changes  |  32 ++++++
 automake-testsuite.spec     |   2 +-
 automake.changes            |  34 +++++++
 automake.spec               |   2 +-
 8 files changed, 178 insertions(+), 105 deletions(-)
 delete mode 100644 automake-1.13.2.tar.xz
 create mode 100644 automake-1.13.3.tar.xz

diff --git a/automake-1.13.2.tar.xz b/automake-1.13.2.tar.xz
deleted file mode 100644
index 069710b..0000000
--- a/automake-1.13.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80692147333399def4116ac1967e92fea9dd26f28670a36600efc2755648a646
-size 1439596
diff --git a/automake-1.13.3.tar.xz b/automake-1.13.3.tar.xz
new file mode 100644
index 0000000..6c3c6cf
--- /dev/null
+++ b/automake-1.13.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81f9d396081b8c83eb054b468ce6e4f7000a4a97c17956c315decfa830913724
+size 1448176
diff --git a/automake-SuSE.patch b/automake-SuSE.patch
index 3958d03..1532103 100644
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -1,14 +1,14 @@
 ---
- lib/config.guess |  148 +++++++++++++++++++++++++++++--------------------------
- 1 file changed, 79 insertions(+), 69 deletions(-)
+ lib/config.guess |  152 +++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 81 insertions(+), 71 deletions(-)
 
 Index: lib/config.guess
 ===================================================================
---- 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
+--- lib/config.guess.orig	2013-05-30 23:06:07.000000000 +0200
++++ lib/config.guess	2013-06-12 15:02:45.505846755 +0200
+@@ -153,6 +153,16 @@ Linux|GNU|GNU/*)
+ 	;;
+ esac
  
 +case "${UNAME_MACHINE}" in
 +  i?86)
@@ -23,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
-@@ -196,23 +206,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -217,23 +227,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	exit ;;
      *:Bitrig:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -53,7 +53,7 @@ Index: lib/config.guess
  	exit ;;
      alpha:OSF1:*:*)
  	case $UNAME_RELEASE in
-@@ -280,13 +290,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -301,13 +311,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo alpha-dec-winnt3.5
  	exit ;;
      Amiga*:UNIX_System_V:4.0:*)
@@ -70,7 +70,7 @@ Index: lib/config.guess
  	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
-@@ -301,7 +311,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -322,7 +332,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit ;;
      arm*:riscos:*:*|arm*:RISCOS:*:*)
@@ -79,7 +79,7 @@ Index: lib/config.guess
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  	echo hppa1.1-hitachi-hiuxmpp
-@@ -409,7 +419,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -430,7 +440,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo m68k-hades-mint${UNAME_RELEASE}
  	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -88,7 +88,7 @@ Index: lib/config.guess
  	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
-@@ -720,9 +730,9 @@ EOF
+@@ -741,9 +751,9 @@ EOF
  	exit ;;
      i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
@@ -100,7 +100,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      parisc*:Lites*:*:*)
-@@ -782,18 +792,18 @@ EOF
+@@ -803,18 +813,18 @@ EOF
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit ;;
      sparc*:BSD/OS:*:*)
@@ -123,7 +123,7 @@ Index: lib/config.guess
  	esac
  	exit ;;
      i*:CYGWIN*:*)
-@@ -821,10 +831,10 @@ EOF
+@@ -842,10 +852,10 @@ EOF
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
  	    authenticamd | genuineintel | EM64T)
@@ -136,7 +136,7 @@ Index: lib/config.guess
  		exit ;;
  	esac ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -843,31 +853,31 @@ EOF
+@@ -864,31 +874,31 @@ EOF
  	echo ${UNAME_MACHINE}-pc-uwin
  	exit ;;
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
@@ -153,164 +153,167 @@ Index: lib/config.guess
  	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,/.*$,,'`
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`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
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
  	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
      aarch64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      aarch64_be:Linux:*:*)
  	UNAME_MACHINE=aarch64_be
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -881,7 +891,7 @@ EOF
+@@ -902,29 +912,29 @@ 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}
+ 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      arc:Linux:*:* | arceb:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -891,19 +901,19 @@ EOF
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${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
--	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	    echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	else
  	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
  		| grep -q __ARM_PCS_VFP
  	    then
--		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+		echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
  	    else
--		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+		echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabihf
+-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++		echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
  	    fi
  	fi
  	exit ;;
      avr32*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      cris:Linux:*:*)
- 	echo ${UNAME_MACHINE}-axis-linux-gnu
-@@ -912,10 +922,10 @@ EOF
- 	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+@@ -933,22 +943,22 @@ EOF
+ 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      hexagon:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      i*86:Linux:*:*)
- 	LIBC=gnu
-@@ -934,13 +944,13 @@ EOF
- 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
  	exit ;;
      ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -959,48 +969,48 @@ EOF
+@@ -967,57 +977,57 @@ 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; }
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
  	;;
      or1k:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      or32:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      padre:Linux:*:*)
--	echo sparc-unknown-linux-gnu
-+	echo sparc-${VENDOR}-linux-gnu
+-	echo sparc-unknown-linux-${LIBC}
++	echo sparc-${VENDOR}-linux-${LIBC}
  	exit ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-${VENDOR}-linux-gnu
+-	echo hppa64-unknown-linux-${LIBC}
++	echo hppa64-${VENDOR}-linux-${LIBC}
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
--	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
--	  *)    echo hppa-unknown-linux-gnu ;;
-+	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
-+	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
-+	  *)    echo hppa-${VENDOR}-linux-gnu ;;
+-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+-	  *)    echo hppa-unknown-linux-${LIBC} ;;
++	  PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
++	  *)    echo hppa-${VENDOR}-linux-${LIBC} ;;
  	esac
  	exit ;;
      ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-${VENDOR}-linux-gnu
+-	echo powerpc64-unknown-linux-${LIBC}
++	echo powerpc64-${VENDOR}-linux-${LIBC}
  	exit ;;
      ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-${VENDOR}-linux-gnu
+-	echo powerpc-unknown-linux-${LIBC}
++	echo powerpc-${VENDOR}-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
+ 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
  	exit ;;
      sh64*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      tile*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
-@@ -1011,7 +1021,7 @@ EOF
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      xtensa*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
  	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1033,16 +1043,16 @@ EOF
+@@ -1039,16 +1049,16 @@ EOF
  	echo ${UNAME_MACHINE}-pc-os2-emx
  	exit ;;
      i*86:XTS-300:*:STOP)
@@ -330,7 +333,7 @@ Index: lib/config.guess
  	exit ;;
      i*86:*DOS:*:*)
  	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1062,7 +1072,7 @@ EOF
+@@ -1068,7 +1078,7 @@ EOF
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  	esac
@@ -339,7 +342,7 @@ Index: lib/config.guess
  	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
-@@ -1101,7 +1111,7 @@ EOF
+@@ -1107,7 +1117,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.
@@ -348,7 +351,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      mini*:CTIX:SYS*5:*)
-@@ -1138,19 +1148,19 @@ EOF
+@@ -1144,19 +1154,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*:*)
@@ -372,7 +375,7 @@ Index: lib/config.guess
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1200,7 +1210,7 @@ EOF
+@@ -1206,7 +1216,7 @@ EOF
  	if [ -d /usr/nec ]; then
  		echo mips-nec-sysv${UNAME_RELEASE}
  	else
@@ -381,7 +384,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1216,7 +1226,7 @@ EOF
+@@ -1222,7 +1232,7 @@ EOF
  	echo i586-pc-haiku
  	exit ;;
      x86_64:Haiku:*:*)
@@ -390,7 +393,7 @@ Index: lib/config.guess
  	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
-@@ -1297,13 +1307,13 @@ EOF
+@@ -1305,13 +1315,13 @@ EOF
  	else
  	    UNAME_MACHINE="$cputype"
  	fi
@@ -407,7 +410,7 @@ Index: lib/config.guess
  	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
-@@ -1312,16 +1322,16 @@ EOF
+@@ -1320,16 +1330,16 @@ EOF
  	echo pdp10-xkl-tops20
  	exit ;;
      *:TOPS-20:*:*)
@@ -427,7 +430,7 @@ Index: lib/config.guess
  	exit ;;
      *:*VMS:*:*)
  	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1343,7 +1353,7 @@ EOF
+@@ -1351,7 +1361,7 @@ EOF
  	echo ${UNAME_MACHINE}-pc-aros
  	exit ;;
      x86_64:VMkernel:*:*)
diff --git a/automake-require_file.patch b/automake-require_file.patch
index 18960d8..928845a 100644
--- a/automake-require_file.patch
+++ b/automake-require_file.patch
@@ -1,8 +1,12 @@
+---
+ automake.in |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 Index: automake.in
 ===================================================================
---- automake.in.orig
-+++ automake.in
-@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$)
+--- automake.in.orig	2013-06-03 16:18:00.000000000 +0200
++++ automake.in	2013-06-12 15:04:11.772901297 +0200
+@@ -7489,12 +7489,14 @@ sub required_file_check_or_copy ($$$)
    my $fullfile = "$dir/$file";
    my $found_it = 0;
    my $dangling_sym = 0;
diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index c541ec7..804cdef 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de
+
+- Update to 1.13.3:
+  * Documentation fixes:
+
+    - The documentation no longer mistakenly reports that the
+      obsolete 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable
+      are going to be removed in Automake 2.0.
+
+  * Bugs fixed:
+
+    - Byte-compilation of Emacs lisp files could fail spuriously on
+      Solaris, when /bin/ksh or /usr/xpg4/bin/sh were used as shell.
+
+    - If the same user-defined suffixes were transformed into
+      different Automake-known suffixes in different Makefile.am
+      files in the same project, automake could get confused and
+      generate inconsistent Makefiles (automake bug#14441).
+      For example, if 'Makefile.am' contained a ".ext.cc:" suffix
+      rule, and 'sub/Makefile.am' contained a ".ext.c:" suffix rule,
+      automake would have mistakenly placed into 'Makefile.in' rules
+      to compile "*.c" files into object files, and into
+      'sub/Makefile.in' rules to compile "*.cc" files into object
+      files --- rather than the other way around.  This is now fixed.
+
+  - Several spurious failures have been fixed (they hit especially
+    MinGW/MSYS builds).  See automake bugs #14493, #14494, #14495,
+    #14498, #14499, #14500, #14501, #14517 and #14528.
+
+  - Some other minor miscellaneous changes and fixlets.
+
 -------------------------------------------------------------------
 Tue May 28 14:21:04 CEST 2013 - pth@suse.de
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 084d55f..3870857 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.2
+Version:        1.13.3
 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 c541ec7..9c3589f 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de
+
+- Update to 1.13.3:
+  * Documentation fixes:
+
+    - The documentation no longer mistakenly reports that the
+      obsolete 'AM_MKDIR_PROG_P' macro and '$(mkdir_p)' make variable
+      are going to be removed in Automake 2.0.
+
+  * Bugs fixed:
+
+    - Byte-compilation of Emacs lisp files could fail spuriously on
+      Solaris, when /bin/ksh or /usr/xpg4/bin/sh were used as shell.
+
+    - If the same user-defined suffixes were transformed into
+      different Automake-known suffixes in different Makefile.am
+      files in the same project, automake could get confused and
+      generate inconsistent Makefiles (automake bug#14441).
+      For example, if 'Makefile.am' contained a ".ext.cc:" suffix
+      rule, and 'sub/Makefile.am' contained a ".ext.c:" suffix rule,
+      automake would have mistakenly placed into 'Makefile.in' rules
+      to compile "*.c" files into object files, and into
+      'sub/Makefile.in' rules to compile "*.cc" files into object
+      files --- rather than the other way around.  This is now fixed.
+
+  - Several spurious failures have been fixed (they hit especially
+    MinGW/MSYS builds).  See automake bugs #14493, #14494, #14495,
+    #14498, #14499, #14500, #14501, #14517 and #14528.
+
+  - 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.spec b/automake.spec
index 6b2a9a9..80f2ee3 100644
--- a/automake.spec
+++ b/automake.spec
@@ -34,7 +34,7 @@ Requires:       flex
 %endif
 Requires:       autoconf >= 2.69
 Requires:       info
-Version:        1.13.2
+Version:        1.13.3
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 License:        GPL-2.0+

From 5d72b8d9f44b6a4d58d77145a4c9d91fd60e7cacc43b2936730cd90ceed7b17f Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Mon, 17 Jun 2013 11:45:26 +0000
Subject: [PATCH 2/3] - 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+

From 99fd556f2da595202ed3347a6f31664c922ff7606ddc339bcc598c30c56e79d8 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Mon, 17 Jun 2013 11:46:26 +0000
Subject: [PATCH 3/3] - Adapt automake-SuSE.patch to changed config.guess.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=36
---
 automake.changes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/automake.changes b/automake.changes
index 39387c4..3842679 100644
--- a/automake.changes
+++ b/automake.changes
@@ -6,6 +6,7 @@ Mon Jun 17 13:43:50 CEST 2013 - pth@suse.de
     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).
+- Adapt automake-SuSE.patch to changed config.guess.
 
 -------------------------------------------------------------------
 Wed Jun 12 15:07:16 CEST 2013 - pth@suse.de