From 029916bb48e174b4cd9502f67108bcd75bfb131f8aafc370d06cf044778aa4c9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 29 Apr 2013 09:54:26 +0000 Subject: [PATCH] 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}