rpm/automake
SHA256
1
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

- Remove aclocal-am_ac.patch and aclocal-am_ac.sh as they aren't

Browse Source 
needed anymore and instead cause havok.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=31
This commit is contained in:
Philipp Thomas 2013-05-28 12:23:43 +00:00 committed by Git OBS Bridge
parent 7d9e623ad2
commit 191eaa3d74
6 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aclocal-am_ac.patch
View File

@ -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)

16
aclocal-am_ac.sh
View File

@ -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

7
automake-testsuite.changes
View File

@ -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.
-------------------------------------------------------------------

5
automake-testsuite.spec
View File

@ -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}

6
automake.changes
View File

@ -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

5
automake.spec
View File

@ -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}