forked from pool/automake
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
This commit is contained in:
Git OBS Bridge
parent
7ff18ec4ec
commit
029916bb48
17
aclocal-am_ac.patch
Normal file
17
aclocal-am_ac.patch
Normal file
@ -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)
|
||||
16
aclocal-am_ac.sh
Normal file
16
aclocal-am_ac.sh
Normal file
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user