From 9474f91aaff7cf3a2a5b8d96871c6e5e69b41ec66459a60da31806daee6faf63 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 27 Feb 2013 05:42:22 +0000
Subject: [PATCH 1/7] Updating link to change in openSUSE:Factory/automake
 revision 32.0

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=c3c23f5c958552c55ccf51b4fb8cede0
---
 automake-1.12.1.tar.xz                |  3 ++
 automake-1.13.1.tar.xz                |  3 --
 automake-SuSE.patch                   | 64 ++++++++++-----------------
 automake-add-mkdir_p-temporarly.patch | 12 +++++
 automake-require_file.patch           |  6 +--
 automake-testsuite.changes            | 40 -----------------
 automake-testsuite.spec               | 25 +++++------
 automake.changes                      | 43 ------------------
 automake.spec                         | 25 ++++++-----
 9 files changed, 69 insertions(+), 152 deletions(-)
 create mode 100644 automake-1.12.1.tar.xz
 delete mode 100644 automake-1.13.1.tar.xz
 create mode 100644 automake-add-mkdir_p-temporarly.patch

diff --git a/automake-1.12.1.tar.xz b/automake-1.12.1.tar.xz
new file mode 100644
index 0000000..734a969
--- /dev/null
+++ b/automake-1.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32750869b24ac2a25765215fdf75c349aabf9465e436de2351602e1aca5c173f
+size 1352384
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-SuSE.patch b/automake-SuSE.patch
index 10618d7..b20fab6 100644
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -1,8 +1,6 @@
-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	2012-04-06 12:31:44.062249033 -0400
++++ lib/config.guess	2012-04-06 12:59:56.696088199 -0400
+@@ -138,6 +138,16 @@
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -19,12 +17,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}:$
- 	exit ;;
-     *:Bitrig:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
--	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+@@ -202,19 +212,19 @@
  	exit ;;
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -49,7 +42,7 @@ Index: lib/config.guess
  	exit ;;
      alpha:OSF1:*:*)
  	case $UNAME_RELEASE in
-@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -282,13 +292,13 @@
  	echo alpha-dec-winnt3.5
  	exit ;;
      Amiga*:UNIX_System_V:4.0:*)
@@ -66,16 +59,16 @@ Index: lib/config.guess
  	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
-@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -303,7 +313,7 @@
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit ;;
-     arm*:riscos:*:*|arm*:RISCOS:*:*)
+     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
-@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -411,7 +421,7 @@
  	echo m68k-hades-mint${UNAME_RELEASE}
  	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -84,7 +77,7 @@ Index: lib/config.guess
  	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
-@@ -724,9 +734,9 @@ EOF
+@@ -722,9 +732,9 @@
  	exit ;;
      i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
@@ -96,7 +89,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      parisc*:Lites*:*:*)
-@@ -786,18 +796,18 @@ EOF
+@@ -784,18 +794,18 @@
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit ;;
      sparc*:BSD/OS:*:*)
@@ -119,7 +112,7 @@ Index: lib/config.guess
  	esac
  	exit ;;
      i*:CYGWIN*:*)
-@@ -825,10 +835,10 @@ EOF
+@@ -820,10 +830,10 @@
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
  	    authenticamd | genuineintel | EM64T)
@@ -132,7 +125,7 @@ Index: lib/config.guess
  		exit ;;
  	esac ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -847,31 +857,31 @@ EOF
+@@ -842,31 +852,31 @@
  	echo ${UNAME_MACHINE}-pc-uwin
  	exit ;;
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
@@ -171,7 +164,7 @@ Index: lib/config.guess
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -885,26 +895,26 @@ EOF
+@@ -880,26 +890,26 @@
  	esac
  	objdump --private-headers /bin/sh | grep -q ld.so.1
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
@@ -203,7 +196,7 @@ Index: lib/config.guess
  	exit ;;
      cris:Linux:*:*)
  	echo ${UNAME_MACHINE}-axis-linux-gnu
-@@ -913,10 +923,10 @@ EOF
+@@ -908,10 +918,10 @@
  	echo ${UNAME_MACHINE}-axis-linux-gnu
  	exit ;;
      frv:Linux:*:*)
@@ -216,7 +209,7 @@ Index: lib/config.guess
  	exit ;;
      i*86:Linux:*:*)
  	LIBC=gnu
-@@ -930,13 +940,13 @@ EOF
+@@ -925,13 +935,13 @@
  	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  	exit ;;
      ia64:Linux:*:*)
@@ -233,7 +226,7 @@ Index: lib/config.guess
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -955,54 +965,54 @@ EOF
+@@ -950,54 +960,54 @@
  	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -303,7 +296,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
+@@ -1019,16 +1029,16 @@
  	echo ${UNAME_MACHINE}-pc-os2-emx
  	exit ;;
      i*86:XTS-300:*:STOP)
@@ -323,7 +316,7 @@ Index: lib/config.guess
  	exit ;;
      i*86:*DOS:*:*)
  	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1053,7 +1063,7 @@ EOF
+@@ -1048,7 +1058,7 @@
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  	esac
@@ -332,7 +325,7 @@ Index: lib/config.guess
  	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
-@@ -1092,7 +1102,7 @@ EOF
+@@ -1087,7 +1097,7 @@
  	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 +334,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      mini*:CTIX:SYS*5:*)
-@@ -1129,19 +1139,19 @@ EOF
+@@ -1124,19 +1134,19 @@
  	/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 +358,7 @@ Index: lib/config.guess
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1191,7 +1201,7 @@ EOF
+@@ -1186,7 +1196,7 @@
  	if [ -d /usr/nec ]; then
  		echo mips-nec-sysv${UNAME_RELEASE}
  	else
@@ -374,16 +367,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1207,7 +1217,7 @@ EOF
- 	echo i586-pc-haiku
- 	exit ;;
-     x86_64:Haiku:*:*)
--	echo x86_64-unknown-haiku
-+	echo x86_64-${VENDOR}-haiku
- 	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
-@@ -1288,13 +1298,13 @@ EOF
+@@ -1280,13 +1290,13 @@
  	else
  	    UNAME_MACHINE="$cputype"
  	fi
@@ -400,7 +384,7 @@ Index: lib/config.guess
  	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
-@@ -1303,16 +1313,16 @@ EOF
+@@ -1295,16 +1305,16 @@
  	echo pdp10-xkl-tops20
  	exit ;;
      *:TOPS-20:*:*)
@@ -420,7 +404,7 @@ Index: lib/config.guess
  	exit ;;
      *:*VMS:*:*)
  	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1334,7 +1344,7 @@ EOF
+@@ -1326,7 +1336,7 @@
  	echo ${UNAME_MACHINE}-pc-aros
  	exit ;;
      x86_64:VMkernel:*:*)
diff --git a/automake-add-mkdir_p-temporarly.patch b/automake-add-mkdir_p-temporarly.patch
new file mode 100644
index 0000000..dab934c
--- /dev/null
+++ b/automake-add-mkdir_p-temporarly.patch
@@ -0,0 +1,12 @@
+Index: automake-1.12.1/m4/init.m4
+===================================================================
+--- automake-1.12.1.orig/m4/init.m4	2012-06-01 15:47:10.000000000 +0200
++++ automake-1.12.1/m4/init.m4	2012-06-01 15:47:10.000000000 +0200
+@@ -82,6 +82,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
+ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
diff --git a/automake-require_file.patch b/automake-require_file.patch
index 18960d8..2d46cc8 100644
--- a/automake-require_file.patch
+++ b/automake-require_file.patch
@@ -1,8 +1,8 @@
 Index: automake.in
 ===================================================================
---- automake.in.orig
-+++ automake.in
-@@ -7750,12 +7750,14 @@ sub required_file_check_or_copy ($$$)
+--- automake.in.orig	2012-06-01 15:47:09.000000000 +0200
++++ automake.in	2012-07-04 09:17:39.816973055 +0200
+@@ -7751,12 +7751,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 e6b35fa..ea7c8f9 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,43 +1,3 @@
--------------------------------------------------------------------
-Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
-
-- Update to version 1.13.1:
-  * Bugs fixed:
-    - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
-      causes a clear and helpful error message, instead of obscure ones
-      (issue introduced in Automake 1.13).
-- Remove config-guess-sub-update.diff; config.guess and config.sub are
-  not included anymore in /lib
-- Clean the specfile; remove useless conditionnal macros
-- Automake now provide manfiles by default and help2man is not required
-  anymore
-
--------------------------------------------------------------------
-Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de
-
-- Run pre_checkin.sh to sync automake-testsuite pec and .changes.
-
--------------------------------------------------------------------
-Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com
-
-- Update to 1.12.3:
-  - reworks and reshuffles the Automake testsuite a bit; fixing some
-    weaknesses and spurious failures in the process, but also, likely,
-    introducing new ones;
-
-  - introduces initial support for automatic dependency tracking with
-    the Portland Group C/C++ compilers (thanks to Dave Goodell and
-    Jeff A. Daily);
-
-  - fixes several long-standing bugs and limitations in the 'ylwrap'
-    script (thanks to Akim Demaille); among the other things, the
-    long-standing PR/491 and automake bug#7648 are now fixed.
-
--------------------------------------------------------------------
-Wed Jul  4 07:21:17 UTC 2012 - coolo@suse.com
-
-- make sure we still define $(mkdir_p) for the time being
-
 -------------------------------------------------------------------
 Wed Jun 27 15:46:00 UTC 2012 - tom.mbrt@googlemail.com
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 7f7fa9c..735d106 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake-testsuite
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,12 @@
 #
 
 
-# PLEASE run pre_checkin.sh in this directory before submitting
-# this package. Otherwise the .spec and .changes for automake-testsuite
-# aren't updated.
-
 Name:           automake-testsuite
-BuildRequires:  autoconf >= 2.69
+BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
+BuildRequires:  help2man
 BuildRequires:  xz
 %if "%{name}" == "automake-testsuite"
 BuildRequires:  libtool
@@ -32,9 +29,9 @@ Requires:       libtool
 BuildRequires:  flex
 Requires:       flex
 %endif
-Requires:       autoconf >= 2.69
+Requires:       autoconf >= 2.62
 Requires:       info
-Version:        1.13.1
+Version:        1.12.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 License:        GPL-2.0+
@@ -43,8 +40,8 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Patch2:         automake-require_file.patch
-Patch100:       automake-SuSE.patch
+Patch1:         automake-SuSE.patch
+Patch3:         automake-require_file.patch
 BuildArch:      noarch
 
 %description
@@ -55,11 +52,10 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
-%patch2
-%patch100
+%patch1
+%patch3
 
 %build
-sh bootstrap.sh
 %configure --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags}
 
@@ -79,6 +75,9 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+mkdir -p %{buildroot}%{_mandir}/man1
+perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
+perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir
diff --git a/automake.changes b/automake.changes
index 5ee81c2..56afc3c 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,46 +1,3 @@
--------------------------------------------------------------------
-Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
-
-- Update to version 1.13.1:
-  * Bugs fixed:
-    - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
-      causes a clear and helpful error message, instead of obscure ones
-      (issue introduced in Automake 1.13).
-- Remove config-guess-sub-update.diff; config.guess and config.sub are
-  not included anymore in /lib
-- Remove 
-- Clean the specfile; remove useless conditionnal macros
-- Automake now provide manfiles by default and help2man is not required
-  anymore
-
--------------------------------------------------------------------
-Sat Feb  2 09:04:19 UTC 2013 - dmueller@suse.com
-
-- update config.guess/sub to the latest state 
-
--------------------------------------------------------------------
-Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de
-
-- Run pre_checkin.sh to sync automake-testsuite pec and .changes.
-
--------------------------------------------------------------------
-Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com
-
-- Update to 1.12.3:
-  - reworks and reshuffles the Automake testsuite a bit; fixing some
-    weaknesses and spurious failures in the process, but also, likely,
-    introducing new ones;
-
-  - introduces initial support for automatic dependency tracking with
-    the Portland Group C/C++ compilers (thanks to Dave Goodell and
-    Jeff A. Daily);
-
-  - fixes several long-standing bugs and limitations in the 'ylwrap'
-    script (thanks to Akim Demaille); among the other things, the
-    long-standing PR/491 and automake bug#7648 are now fixed.
-- Remove automake-add-mkdir_p-temporarly.patch: 
-  * Only temporary hack for openSUSE 12.2, now it is time to remove it
-
 -------------------------------------------------------------------
 Wed Jul  4 07:21:17 UTC 2012 - coolo@suse.com
 
diff --git a/automake.spec b/automake.spec
index 6002b50..35daaed 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,12 @@
 #
 
 
-# PLEASE run pre_checkin.sh in this directory before submitting
-# this package. Otherwise the .spec and .changes for automake-testsuite
-# aren't updated.
-
 Name:           automake
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
+BuildRequires:  help2man
 BuildRequires:  xz
 %if "%{name}" == "automake-testsuite"
 BuildRequires:  libtool
@@ -34,7 +31,7 @@ Requires:       flex
 %endif
 Requires:       autoconf >= 2.69
 Requires:       info
-Version:        1.13.1
+Version:        1.12.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 License:        GPL-2.0+
@@ -43,8 +40,12 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Patch2:         automake-require_file.patch
-Patch100:       automake-SuSE.patch
+Patch1:         automake-SuSE.patch
+Patch3:         automake-require_file.patch
+# this patch makes sure packages that do not call AM_PROG_MKDIR, but use $(mkdir_p) work
+# this patch should be removed after 12.2 is done, packages need to be fixed to use $(MKDIR_P)
+# or avoid autoreconf at all
+Patch4:         automake-add-mkdir_p-temporarly.patch
 BuildArch:      noarch
 
 %description
@@ -55,8 +56,9 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
-%patch2
-%patch100
+%patch1
+%patch3
+%patch4 -p1
 
 %build
 sh bootstrap.sh
@@ -79,6 +81,9 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+mkdir -p %{buildroot}%{_mandir}/man1
+perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
+perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir

From 9fb7e3db293e1a2f0ec3da98181928f6050be886ef2054c3befccf3044502776 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 27 Feb 2013 05:43:54 +0000
Subject: [PATCH 2/7] Accepting request 156497 from openSUSE:Factory

as I reverted the automake version in factory - to put in a staging project - here is the update again

OBS-URL: https://build.opensuse.org/request/show/156497
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=27
---
 automake-1.12.1.tar.xz                |  3 --
 automake-1.13.1.tar.xz                |  3 ++
 automake-SuSE.patch                   | 64 +++++++++++++++++----------
 automake-add-mkdir_p-temporarly.patch | 12 -----
 automake-require_file.patch           |  6 +--
 automake-testsuite.changes            | 40 +++++++++++++++++
 automake-testsuite.spec               | 25 ++++++-----
 automake.changes                      | 43 ++++++++++++++++++
 automake.spec                         | 25 +++++------
 9 files changed, 152 insertions(+), 69 deletions(-)
 delete mode 100644 automake-1.12.1.tar.xz
 create mode 100644 automake-1.13.1.tar.xz
 delete mode 100644 automake-add-mkdir_p-temporarly.patch

diff --git a/automake-1.12.1.tar.xz b/automake-1.12.1.tar.xz
deleted file mode 100644
index 734a969..0000000
--- a/automake-1.12.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32750869b24ac2a25765215fdf75c349aabf9465e436de2351602e1aca5c173f
-size 1352384
diff --git a/automake-1.13.1.tar.xz b/automake-1.13.1.tar.xz
new file mode 100644
index 0000000..7ce74c5
--- /dev/null
+++ b/automake-1.13.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ecd6cf682e78e833361264263f0f9496949bfbae7f8366bc327de38ff0ad18b
+size 1425080
diff --git a/automake-SuSE.patch b/automake-SuSE.patch
index b20fab6..10618d7 100644
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -1,6 +1,8 @@
---- lib/config.guess.orig	2012-04-06 12:31:44.062249033 -0400
-+++ lib/config.guess	2012-04-06 12:59:56.696088199 -0400
-@@ -138,6 +138,16 @@
+Index: lib/config.guess
+===================================================================
+--- lib/config.guess.orig
++++ lib/config.guess
+@@ -136,6 +136,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,12 @@
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -202,19 +212,19 @@
+@@ -200,23 +210,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	exit ;;
+     *:Bitrig:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
  	exit ;;
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -42,7 +49,7 @@
  	exit ;;
      alpha:OSF1:*:*)
  	case $UNAME_RELEASE in
-@@ -282,13 +292,13 @@
+@@ -284,13 +294,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo alpha-dec-winnt3.5
  	exit ;;
      Amiga*:UNIX_System_V:4.0:*)
@@ -59,16 +66,16 @@
  	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
-@@ -303,7 +313,7 @@
+@@ -305,7 +315,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit ;;
-     arm:riscos:*:*|arm:RISCOS:*:*)
+     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
-@@ -411,7 +421,7 @@
+@@ -413,7 +423,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	echo m68k-hades-mint${UNAME_RELEASE}
  	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -77,7 +84,7 @@
  	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten${UNAME_RELEASE}
-@@ -722,9 +732,9 @@
+@@ -724,9 +734,9 @@ EOF
  	exit ;;
      i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
@@ -89,7 +96,7 @@
  	fi
  	exit ;;
      parisc*:Lites*:*:*)
-@@ -784,18 +794,18 @@
+@@ -786,18 +796,18 @@ EOF
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit ;;
      sparc*:BSD/OS:*:*)
@@ -112,7 +119,7 @@
  	esac
  	exit ;;
      i*:CYGWIN*:*)
-@@ -820,10 +830,10 @@
+@@ -825,10 +835,10 @@ EOF
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
  	    authenticamd | genuineintel | EM64T)
@@ -125,7 +132,7 @@
  		exit ;;
  	esac ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -842,31 +852,31 @@
+@@ -847,31 +857,31 @@ EOF
  	echo ${UNAME_MACHINE}-pc-uwin
  	exit ;;
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
@@ -164,7 +171,7 @@
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -880,26 +890,26 @@
+@@ -885,26 +895,26 @@ EOF
  	esac
  	objdump --private-headers /bin/sh | grep -q ld.so.1
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
@@ -196,7 +203,7 @@
  	exit ;;
      cris:Linux:*:*)
  	echo ${UNAME_MACHINE}-axis-linux-gnu
-@@ -908,10 +918,10 @@
+@@ -913,10 +923,10 @@ EOF
  	echo ${UNAME_MACHINE}-axis-linux-gnu
  	exit ;;
      frv:Linux:*:*)
@@ -209,7 +216,7 @@
  	exit ;;
      i*86:Linux:*:*)
  	LIBC=gnu
-@@ -925,13 +935,13 @@
+@@ -930,13 +940,13 @@ EOF
  	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  	exit ;;
      ia64:Linux:*:*)
@@ -226,7 +233,7 @@
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -950,54 +960,54 @@
+@@ -955,54 +965,54 @@ EOF
  	#endif
  EOF
  	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -296,7 +303,7 @@
  	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1019,16 +1029,16 @@
+@@ -1024,16 +1034,16 @@ EOF
  	echo ${UNAME_MACHINE}-pc-os2-emx
  	exit ;;
      i*86:XTS-300:*:STOP)
@@ -316,7 +323,7 @@
  	exit ;;
      i*86:*DOS:*:*)
  	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1048,7 +1058,7 @@
+@@ -1053,7 +1063,7 @@ EOF
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  	esac
@@ -325,7 +332,7 @@
  	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
-@@ -1087,7 +1097,7 @@
+@@ -1092,7 +1102,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.
@@ -334,7 +341,7 @@
  	fi
  	exit ;;
      mini*:CTIX:SYS*5:*)
-@@ -1124,19 +1134,19 @@
+@@ -1129,19 +1139,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*:*)
@@ -358,7 +365,7 @@
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1186,7 +1196,7 @@
+@@ -1191,7 +1201,7 @@ EOF
  	if [ -d /usr/nec ]; then
  		echo mips-nec-sysv${UNAME_RELEASE}
  	else
@@ -367,7 +374,16 @@
  	fi
  	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1280,13 +1290,13 @@
+@@ -1207,7 +1217,7 @@ EOF
+ 	echo i586-pc-haiku
+ 	exit ;;
+     x86_64:Haiku:*:*)
+-	echo x86_64-unknown-haiku
++	echo x86_64-${VENDOR}-haiku
+ 	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+@@ -1288,13 +1298,13 @@ EOF
  	else
  	    UNAME_MACHINE="$cputype"
  	fi
@@ -384,7 +400,7 @@
  	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
-@@ -1295,16 +1305,16 @@
+@@ -1303,16 +1313,16 @@ EOF
  	echo pdp10-xkl-tops20
  	exit ;;
      *:TOPS-20:*:*)
@@ -404,7 +420,7 @@
  	exit ;;
      *:*VMS:*:*)
  	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1326,7 +1336,7 @@
+@@ -1334,7 +1344,7 @@ EOF
  	echo ${UNAME_MACHINE}-pc-aros
  	exit ;;
      x86_64:VMkernel:*:*)
diff --git a/automake-add-mkdir_p-temporarly.patch b/automake-add-mkdir_p-temporarly.patch
deleted file mode 100644
index dab934c..0000000
--- a/automake-add-mkdir_p-temporarly.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: automake-1.12.1/m4/init.m4
-===================================================================
---- automake-1.12.1.orig/m4/init.m4	2012-06-01 15:47:10.000000000 +0200
-+++ automake-1.12.1/m4/init.m4	2012-06-01 15:47:10.000000000 +0200
-@@ -82,6 +82,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
- AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
- AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
- AC_REQUIRE([AC_PROG_AWK])dnl
diff --git a/automake-require_file.patch b/automake-require_file.patch
index 2d46cc8..18960d8 100644
--- a/automake-require_file.patch
+++ b/automake-require_file.patch
@@ -1,8 +1,8 @@
 Index: automake.in
 ===================================================================
---- automake.in.orig	2012-06-01 15:47:09.000000000 +0200
-+++ automake.in	2012-07-04 09:17:39.816973055 +0200
-@@ -7751,12 +7751,14 @@ sub required_file_check_or_copy ($$$)
+--- automake.in.orig
++++ automake.in
+@@ -7750,12 +7750,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 ea7c8f9..e6b35fa 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
+
+- Update to version 1.13.1:
+  * Bugs fixed:
+    - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
+      causes a clear and helpful error message, instead of obscure ones
+      (issue introduced in Automake 1.13).
+- Remove config-guess-sub-update.diff; config.guess and config.sub are
+  not included anymore in /lib
+- Clean the specfile; remove useless conditionnal macros
+- Automake now provide manfiles by default and help2man is not required
+  anymore
+
+-------------------------------------------------------------------
+Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de
+
+- Run pre_checkin.sh to sync automake-testsuite pec and .changes.
+
+-------------------------------------------------------------------
+Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com
+
+- Update to 1.12.3:
+  - reworks and reshuffles the Automake testsuite a bit; fixing some
+    weaknesses and spurious failures in the process, but also, likely,
+    introducing new ones;
+
+  - introduces initial support for automatic dependency tracking with
+    the Portland Group C/C++ compilers (thanks to Dave Goodell and
+    Jeff A. Daily);
+
+  - fixes several long-standing bugs and limitations in the 'ylwrap'
+    script (thanks to Akim Demaille); among the other things, the
+    long-standing PR/491 and automake bug#7648 are now fixed.
+
+-------------------------------------------------------------------
+Wed Jul  4 07:21:17 UTC 2012 - coolo@suse.com
+
+- make sure we still define $(mkdir_p) for the time being
+
 -------------------------------------------------------------------
 Wed Jun 27 15:46:00 UTC 2012 - tom.mbrt@googlemail.com
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 735d106..7f7fa9c 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake-testsuite
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,15 @@
 #
 
 
+# PLEASE run pre_checkin.sh in this directory before submitting
+# this package. Otherwise the .spec and .changes for automake-testsuite
+# aren't updated.
+
 Name:           automake-testsuite
-BuildRequires:  autoconf
+BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
-BuildRequires:  help2man
 BuildRequires:  xz
 %if "%{name}" == "automake-testsuite"
 BuildRequires:  libtool
@@ -29,9 +32,9 @@ Requires:       libtool
 BuildRequires:  flex
 Requires:       flex
 %endif
-Requires:       autoconf >= 2.62
+Requires:       autoconf >= 2.69
 Requires:       info
-Version:        1.12.1
+Version:        1.13.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 License:        GPL-2.0+
@@ -40,8 +43,8 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Patch1:         automake-SuSE.patch
-Patch3:         automake-require_file.patch
+Patch2:         automake-require_file.patch
+Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 
 %description
@@ -52,10 +55,11 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
-%patch1
-%patch3
+%patch2
+%patch100
 
 %build
+sh bootstrap.sh
 %configure --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags}
 
@@ -75,9 +79,6 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
-mkdir -p %{buildroot}%{_mandir}/man1
-perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
-perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir
diff --git a/automake.changes b/automake.changes
index 56afc3c..5ee81c2 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
+
+- Update to version 1.13.1:
+  * Bugs fixed:
+    - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
+      causes a clear and helpful error message, instead of obscure ones
+      (issue introduced in Automake 1.13).
+- Remove config-guess-sub-update.diff; config.guess and config.sub are
+  not included anymore in /lib
+- Remove 
+- Clean the specfile; remove useless conditionnal macros
+- Automake now provide manfiles by default and help2man is not required
+  anymore
+
+-------------------------------------------------------------------
+Sat Feb  2 09:04:19 UTC 2013 - dmueller@suse.com
+
+- update config.guess/sub to the latest state 
+
+-------------------------------------------------------------------
+Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de
+
+- Run pre_checkin.sh to sync automake-testsuite pec and .changes.
+
+-------------------------------------------------------------------
+Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com
+
+- Update to 1.12.3:
+  - reworks and reshuffles the Automake testsuite a bit; fixing some
+    weaknesses and spurious failures in the process, but also, likely,
+    introducing new ones;
+
+  - introduces initial support for automatic dependency tracking with
+    the Portland Group C/C++ compilers (thanks to Dave Goodell and
+    Jeff A. Daily);
+
+  - fixes several long-standing bugs and limitations in the 'ylwrap'
+    script (thanks to Akim Demaille); among the other things, the
+    long-standing PR/491 and automake bug#7648 are now fixed.
+- Remove automake-add-mkdir_p-temporarly.patch: 
+  * Only temporary hack for openSUSE 12.2, now it is time to remove it
+
 -------------------------------------------------------------------
 Wed Jul  4 07:21:17 UTC 2012 - coolo@suse.com
 
diff --git a/automake.spec b/automake.spec
index 35daaed..6002b50 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,15 @@
 #
 
 
+# PLEASE run pre_checkin.sh in this directory before submitting
+# this package. Otherwise the .spec and .changes for automake-testsuite
+# aren't updated.
+
 Name:           automake
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-fortran
-BuildRequires:  help2man
 BuildRequires:  xz
 %if "%{name}" == "automake-testsuite"
 BuildRequires:  libtool
@@ -31,7 +34,7 @@ Requires:       flex
 %endif
 Requires:       autoconf >= 2.69
 Requires:       info
-Version:        1.12.1
+Version:        1.13.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 License:        GPL-2.0+
@@ -40,12 +43,8 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Patch1:         automake-SuSE.patch
-Patch3:         automake-require_file.patch
-# this patch makes sure packages that do not call AM_PROG_MKDIR, but use $(mkdir_p) work
-# this patch should be removed after 12.2 is done, packages need to be fixed to use $(MKDIR_P)
-# or avoid autoreconf at all
-Patch4:         automake-add-mkdir_p-temporarly.patch
+Patch2:         automake-require_file.patch
+Patch100:       automake-SuSE.patch
 BuildArch:      noarch
 
 %description
@@ -56,9 +55,8 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
-%patch1
-%patch3
-%patch4 -p1
+%patch2
+%patch100
 
 %build
 sh bootstrap.sh
@@ -81,9 +79,6 @@ make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
-mkdir -p %{buildroot}%{_mandir}/man1
-perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1
-perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir

From 7ff18ec4ec0d1b33e37fb34475efa3a507215c739ea7585be404f735c20ba03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 20 Mar 2013 15:06:14 +0000
Subject: [PATCH 3/7] Accepting request 160251 from
 home:m_meister:branches:openSUSE:Factory

- Added url as source.
  Please see http://en.opensuse.org/SourceUrls

- Added url as source.
  Please see http://en.opensuse.org/SourceUrls

OBS-URL: https://build.opensuse.org/request/show/160251
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=28
---
 automake-testsuite.changes | 6 ++++++
 automake-testsuite.spec    | 2 +-
 automake.changes           | 6 ++++++
 automake.spec              | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index e6b35fa..1f57961 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 20 13:38:57 UTC 2013 - mmeister@suse.com
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
 -------------------------------------------------------------------
 Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 7f7fa9c..bd5f239 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -41,7 +41,7 @@ License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         automake-%{version}.tar.xz
+Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch
diff --git a/automake.changes b/automake.changes
index 5ee81c2..4ab68c6 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 20 13:38:33 UTC 2013 - mmeister@suse.com
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
 -------------------------------------------------------------------
 Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
 
diff --git a/automake.spec b/automake.spec
index 6002b50..459924c 100644
--- a/automake.spec
+++ b/automake.spec
@@ -41,7 +41,7 @@ License:        GPL-2.0+
 Group:          Development/Tools/Building
 Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         automake-%{version}.tar.xz
+Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch

From 029916bb48e174b4cd9502f67108bcd75bfb131f8aafc370d06cf044778aa4c9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 29 Apr 2013 09:54:26 +0000
Subject: [PATCH 4/7] Accepting request 173676 from
 openSUSE:Factory:Staging:Automake

- add a script to replace obsolete macros in configure.*
- call it from aclocal to avoid having to patch hundreds of packages

- Remove
- update config.guess/sub to the latest state

- Remove automake-add-mkdir_p-temporarly.patch:
  * Only temporary hack for openSUSE 12.2, now it is time to remove it
- add a script to replace obsolete macros in configure.*
- call it from aclocal to avoid having to patch hundreds of packages

OBS-URL: https://build.opensuse.org/request/show/173676
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=29
---
 aclocal-am_ac.patch        | 17 +++++++++++++++++
 aclocal-am_ac.sh           | 16 ++++++++++++++++
 automake-testsuite.changes | 16 +++++++++++++++-
 automake-testsuite.spec    |  4 ++++
 automake.changes           |  6 ++++++
 automake.spec              |  4 ++++
 6 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 aclocal-am_ac.patch
 create mode 100644 aclocal-am_ac.sh

diff --git a/aclocal-am_ac.patch b/aclocal-am_ac.patch
new file mode 100644
index 0000000..007b8a2
--- /dev/null
+++ b/aclocal-am_ac.patch
@@ -0,0 +1,17 @@
+--- aclocal.in.orig	2013-04-25 13:03:46.985573267 +0200
++++ aclocal.in	2013-04-25 15:12:06.778225114 +0200
+@@ -1139,6 +1139,14 @@
+ # hence it should be output at a different position in aclocal.m4.  If
+ # we did not rerun aclocal, the next run of aclocal would produce a
+ # different aclocal.m4.
++
++# Some packages fail fatally, since they still use the
++# AM_CONFIG_HEADER which is deprecated, instead of the
++# AC_CONFIG_HEADER macro in the configure.in/ac
++if(-e "/.buildenv" && -x "/usr/share/aclocal/aclocal-am_ac.sh"){
++	system("/usr/share/aclocal/aclocal-am_ac.sh");
++}
++
+ my $loop = 0;
+ my $rerun_due_to_macrodir = 0;
+ while (1)
diff --git a/aclocal-am_ac.sh b/aclocal-am_ac.sh
new file mode 100644
index 0000000..dbe75c4
--- /dev/null
+++ b/aclocal-am_ac.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+REPLACE="AM_CONFIG_HEADER:AC_CONFIG_HEADER AM_PROG_CC_STDC:AC_PROG_CC"
+for i in $REPLACE; do
+	OLD=$(echo $i | cut -d: -f1)
+	NEW=$(echo $i | cut -d: -f2)
+	if test -e configure.in && grep -q $OLD configure.in; then
+		sed -i "s/$OLD/$NEW/" configure.in
+		echo "replacing $OLD with $NEW in configure.in"
+	fi
+	if test -e configure.ac && grep -q $OLD configure.ac; then
+		sed -i "s/$OLD/$NEW/" configure.ac
+		echo "replacing $OLD with $NEW in configure.ac"
+	fi
+done
+
diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index 1f57961..b87118f 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,5 +1,11 @@
 -------------------------------------------------------------------
-Wed Mar 20 13:38:57 UTC 2013 - mmeister@suse.com
+Mon Apr 29 07:55:39 UTC 2013 - mmeister@suse.com
+
+- add a script to replace obsolete macros in configure.*
+- call it from aclocal to avoid having to patch hundreds of packages
+
+-------------------------------------------------------------------
+Wed Mar 20 13:38:33 UTC 2013 - mmeister@suse.com
 
 - Added url as source.
   Please see http://en.opensuse.org/SourceUrls
@@ -14,10 +20,16 @@ Tue Feb 19 18:50:46 UTC 2013 - p.drouand@gmail.com
       (issue introduced in Automake 1.13).
 - Remove config-guess-sub-update.diff; config.guess and config.sub are
   not included anymore in /lib
+- Remove 
 - Clean the specfile; remove useless conditionnal macros
 - Automake now provide manfiles by default and help2man is not required
   anymore
 
+-------------------------------------------------------------------
+Sat Feb  2 09:04:19 UTC 2013 - dmueller@suse.com
+
+- update config.guess/sub to the latest state 
+
 -------------------------------------------------------------------
 Thu Sep 13 12:29:33 CEST 2012 - pth@suse.de
 
@@ -38,6 +50,8 @@ Tue Sep 11 17:34:05 UTC 2012 - p.drouand@gmail.com
   - fixes several long-standing bugs and limitations in the 'ylwrap'
     script (thanks to Akim Demaille); among the other things, the
     long-standing PR/491 and automake bug#7648 are now fixed.
+- Remove automake-add-mkdir_p-temporarly.patch: 
+  * Only temporary hack for openSUSE 12.2, now it is time to remove it
 
 -------------------------------------------------------------------
 Wed Jul  4 07:21:17 UTC 2012 - coolo@suse.com
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index bd5f239..ac11261 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -43,8 +43,10 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
+Source2:        aclocal-am_ac.sh
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch
+Patch101:       aclocal-am_ac.patch
 BuildArch:      noarch
 
 %description
@@ -57,6 +59,7 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch100
+%patch101
 
 %build
 sh bootstrap.sh
@@ -77,6 +80,7 @@ make check VERBOSE=1
 %install
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
+install -m755 %{S:2} %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
diff --git a/automake.changes b/automake.changes
index 4ab68c6..b87118f 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 29 07:55:39 UTC 2013 - mmeister@suse.com
+
+- add a script to replace obsolete macros in configure.*
+- call it from aclocal to avoid having to patch hundreds of packages
+
 -------------------------------------------------------------------
 Wed Mar 20 13:38:33 UTC 2013 - mmeister@suse.com
 
diff --git a/automake.spec b/automake.spec
index 459924c..5dd12c6 100644
--- a/automake.spec
+++ b/automake.spec
@@ -43,8 +43,10 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
+Source2:        aclocal-am_ac.sh
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch
+Patch101:       aclocal-am_ac.patch
 BuildArch:      noarch
 
 %description
@@ -57,6 +59,7 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch100
+%patch101
 
 %build
 sh bootstrap.sh
@@ -77,6 +80,7 @@ make check VERBOSE=1
 %install
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
+install -m755 %{S:2} %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}

From 7d9e623ad21d755684c3722f9bfdee7b55a7eb5c1549d7ea2f583a65597899ad Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Mon, 27 May 2013 14:46:08 +0000
Subject: [PATCH 5/7] - 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.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=30
---
 automake-1.13.1.tar.xz     |  3 --
 automake-1.13.2.tar.xz     |  3 ++
 automake-SuSE.patch        | 67 +++++++++++++++++++++-----------------
 automake-testsuite.changes | 45 +++++++++++++++++++++++++
 automake-testsuite.spec    |  2 +-
 automake.changes           | 46 ++++++++++++++++++++++++++
 automake.spec              |  2 +-
 pre_checkin.sh             |  3 +-
 8 files changed, 135 insertions(+), 36 deletions(-)
 delete mode 100644 automake-1.13.1.tar.xz
 create mode 100644 automake-1.13.2.tar.xz

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
 

From 191eaa3d744b980bff30b2faa1b50c2b4c8fddef85d84bd89614abd5194989c5 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Tue, 28 May 2013 12:23:43 +0000
Subject: [PATCH 6/7] - Remove aclocal-am_ac.patch and aclocal-am_ac.sh as they
 aren't   needed anymore and instead cause havok.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=31
---
 aclocal-am_ac.patch        | 17 -----------------
 aclocal-am_ac.sh           | 16 ----------------
 automake-testsuite.changes |  7 +++++++
 automake-testsuite.spec    |  5 -----
 automake.changes           |  6 ++++++
 automake.spec              |  5 -----
 6 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 aclocal-am_ac.patch
 delete mode 100644 aclocal-am_ac.sh

diff --git a/aclocal-am_ac.patch b/aclocal-am_ac.patch
deleted file mode 100644
index 007b8a2..0000000
--- a/aclocal-am_ac.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- aclocal.in.orig	2013-04-25 13:03:46.985573267 +0200
-+++ aclocal.in	2013-04-25 15:12:06.778225114 +0200
-@@ -1139,6 +1139,14 @@
- # hence it should be output at a different position in aclocal.m4.  If
- # we did not rerun aclocal, the next run of aclocal would produce a
- # different aclocal.m4.
-+
-+# Some packages fail fatally, since they still use the
-+# AM_CONFIG_HEADER which is deprecated, instead of the
-+# AC_CONFIG_HEADER macro in the configure.in/ac
-+if(-e "/.buildenv" && -x "/usr/share/aclocal/aclocal-am_ac.sh"){
-+	system("/usr/share/aclocal/aclocal-am_ac.sh");
-+}
-+
- my $loop = 0;
- my $rerun_due_to_macrodir = 0;
- while (1)
diff --git a/aclocal-am_ac.sh b/aclocal-am_ac.sh
deleted file mode 100644
index dbe75c4..0000000
--- a/aclocal-am_ac.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-REPLACE="AM_CONFIG_HEADER:AC_CONFIG_HEADER AM_PROG_CC_STDC:AC_PROG_CC"
-for i in $REPLACE; do
-	OLD=$(echo $i | cut -d: -f1)
-	NEW=$(echo $i | cut -d: -f2)
-	if test -e configure.in && grep -q $OLD configure.in; then
-		sed -i "s/$OLD/$NEW/" configure.in
-		echo "replacing $OLD with $NEW in configure.in"
-	fi
-	if test -e configure.ac && grep -q $OLD configure.ac; then
-		sed -i "s/$OLD/$NEW/" configure.ac
-		echo "replacing $OLD with $NEW in configure.ac"
-	fi
-done
-
diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index e699ee9..c541ec7 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 28 14:21:04 CEST 2013 - pth@suse.de
+
+- Remove aclocal-am_ac.patch and aclocal-am_ac.sh as they aren't
+  needed anymore and instead cause havok.
+
 -------------------------------------------------------------------
 Mon May 27 15:28:36 CEST 2013 - pth@suse.de
 
@@ -41,6 +47,7 @@ Mon May 27 15:28:36 CEST 2013 - pth@suse.de
 
   - 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.
 
 -------------------------------------------------------------------
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 7f656b6..befa1dd 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -43,10 +43,8 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Source2:        aclocal-am_ac.sh
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch
-Patch101:       aclocal-am_ac.patch
 BuildArch:      noarch
 
 %description
@@ -59,7 +57,6 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch100
-%patch101
 
 %build
 sh bootstrap.sh
@@ -79,8 +76,6 @@ make check VERBOSE=1
 
 %install
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
-install -m755 %{S:2} %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
diff --git a/automake.changes b/automake.changes
index 353e362..c541ec7 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 28 14:21:04 CEST 2013 - pth@suse.de
+
+- Remove aclocal-am_ac.patch and aclocal-am_ac.sh as they aren't
+  needed anymore and instead cause havok.
+
 -------------------------------------------------------------------
 Mon May 27 15:28:36 CEST 2013 - pth@suse.de
 
diff --git a/automake.spec b/automake.spec
index 9791373..7c9192b 100644
--- a/automake.spec
+++ b/automake.spec
@@ -43,10 +43,8 @@ Url:            http://www.gnu.org/software/automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        automake-rpmlintrc
-Source2:        aclocal-am_ac.sh
 Patch2:         automake-require_file.patch
 Patch100:       automake-SuSE.patch
-Patch101:       aclocal-am_ac.patch
 BuildArch:      noarch
 
 %description
@@ -59,7 +57,6 @@ definitions (with rules occasionally thrown in).  The generated
 %setup -q -n automake-%{version}
 %patch2
 %patch100
-%patch101
 
 %build
 sh bootstrap.sh
@@ -79,8 +76,6 @@ make check VERBOSE=1
 
 %install
 make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal
-install -m755 %{S:2} %{buildroot}/usr/share/aclocal
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
 ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}

From 0874722ff8098674340aadf28e4aae13b8d240f7f7e1664f9cc113a7aa807ed9 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 29 May 2013 09:18:44 +0000
Subject: [PATCH 7/7] fix build

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=32
---
 automake-testsuite.spec | 3 ++-
 automake.spec           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index befa1dd..084d55f 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -76,8 +76,9 @@ make check VERBOSE=1
 
 %install
 make install DESTDIR=%{buildroot}
+mkdir %{buildroot}/etc
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
-ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+ln -s /etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir
diff --git a/automake.spec b/automake.spec
index 7c9192b..6b2a9a9 100644
--- a/automake.spec
+++ b/automake.spec
@@ -76,8 +76,9 @@ make check VERBOSE=1
 
 %install
 make install DESTDIR=%{buildroot}
+mkdir %{buildroot}/etc
 echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist
-ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
+ln -s /etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist
 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name}
 # info's dir file is not auto ignored on some systems
 rm -rf %{buildroot}%{_infodir}/dir