From 7b1dcab237501086bb3d394495d2976f7987fef8 Mon Sep 17 00:00:00 2001 From: akdengi Date: Sat, 10 Aug 2013 09:31:59 +0400 Subject: [PATCH] add backward compartibilitys (thank Bero) and update to 1.13.4 --- .abf.yml | 8 ++-- ...e-1.13.1-automatically-fix-old-files.patch | 28 +++++++++++++ automake.spec | 41 ++++++++----------- fix-old-automake-files | 13 ++++++ 4 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 automake-1.13.1-automatically-fix-old-files.patch create mode 100644 fix-old-automake-files diff --git a/.abf.yml b/.abf.yml index 9dbdb58..d63b316 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ -sources: - "automake-1.12.3.tar.xz": d08297e9eb36c82e1baa4e7ad9d27fc1f7e91537 - automake-1.13.1.tar.xz: cf0c93328ccc40412b2a6a2d96075b41e2182659 - automake-1.13.1.tar.xz: cf0c93328ccc40412b2a6a2d96075b41e2182659 +removed_sources: + automake-1.12.3.tar.xz: d08297e9eb36c82e1baa4e7ad9d27fc1f7e91537 automake-1.13.1.tar.xz: cf0c93328ccc40412b2a6a2d96075b41e2182659 automake-1.13.2.tar.xz: c4112e241478a1959a430430ccbd73eb1422fa44 +sources: + automake-1.13.4.tar.xz: 20dac46d2699cb32c8102584db67e964c472b03e diff --git a/automake-1.13.1-automatically-fix-old-files.patch b/automake-1.13.1-automatically-fix-old-files.patch new file mode 100644 index 0000000..77c49df --- /dev/null +++ b/automake-1.13.1-automatically-fix-old-files.patch @@ -0,0 +1,28 @@ +--- automake-1.13.1/aclocal.in.0000~ 2013-01-01 12:50:12.000000000 +0100 ++++ automake-1.13.1/aclocal.in 2013-04-23 13:16:02.405057615 +0200 +@@ -81,6 +81,9 @@ my @diff_command; + # --dry-run + my $dry_run = 0; + ++# --dont-fix ++my $dont_fix = 0; ++ + # configure.ac or configure.in. + my $configure_ac; + +@@ -1058,6 +1061,7 @@ sub parse_arguments () + 'system-acdir=s' => sub { shift; @system_includes = @_; }, + 'automake-acdir=s' => sub { shift; @automake_includes = @_; }, + 'diff:s' => \$diff_command, ++ 'dont-fix' => \$dont_fix, + 'dry-run' => \$dry_run, + 'force' => \$force_output, + 'I=s' => \@user_includes, +@@ -1129,6 +1133,7 @@ sub parse_ACLOCAL_PATH () + + parse_WARNINGS; # Parse the WARNINGS environment variable. + parse_arguments; ++system("fix-old-automake-files") if(!$dont_fix); + parse_ACLOCAL_PATH; + $configure_ac = require_configure_ac; + diff --git a/automake.spec b/automake.spec index 90f5447..2195fe6 100644 --- a/automake.spec +++ b/automake.spec @@ -5,23 +5,26 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake -Version: 1.13.2 +Version: 1.13.4 Release: 1 License: GPLv2+ Group: Development/Other Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz -# Adds 'make dist-xz' target, backport from git +Source100: fix-old-automake-files +# Automatically invoke fix-old-automake-files from aclocal +Patch0: automake-1.13.1-automatically-fix-old-files.patch URL: http://sources.redhat.com/automake/ BuildArch: noarch Requires: autoconf +Requires: sed BuildRequires: autoconf BuildRequires: texinfo Conflicts: automake1.5 Provides: automake1.9 = %{version}-%{release} -Obsoletes: automake1.9 < %{version}-%{release} +Obsoletes: automake1.9 Provides: automake1.8 = %{version}-%{release} -Obsoletes: automake1.8 < %{version}-%{release} +Obsoletes: automake1.8 Requires(post): update-alternatives Requires(preun): update-alternatives @@ -47,6 +50,7 @@ Autoconf package. %prep %setup -q +%apply_patches %build # (Abel) config* don't understand noarch-mandriva-linux-gnu arch @@ -66,30 +70,18 @@ Autoconf package. %__rm -rf %{buildroot} %makeinstall_std -# provide -1.8 symlinks -%__ln_s automake-%{amversion} %{buildroot}%{_bindir}/automake-1.8 -%__ln_s aclocal-%{amversion} %{buildroot}%{_bindir}/aclocal-1.8 - -# provide -1.9 symlinks -%__ln_s automake-%{amversion} %{buildroot}%{_bindir}/automake-1.9 -%__ln_s aclocal-%{amversion} %{buildroot}%{_bindir}/aclocal-1.9 - -# provide -1.11 symlinks -%__ln_s automake-%{amversion} %{buildroot}%{_bindir}/automake-1.11 -%__ln_s aclocal-%{amversion} %{buildroot}%{_bindir}/aclocal-1.11 - -# provide -1.12 symlinks -%__ln_s automake-%{amversion} %{buildroot}%{_bindir}/automake-1.12 -%__ln_s aclocal-%{amversion} %{buildroot}%{_bindir}/aclocal-1.12 +# provide -1.x symlinks +for i in 8 9 11 12; do + %__ln_s automake-%{amversion} %{buildroot}%{_bindir}/automake-1.$i + %__ln_s aclocal-%{amversion} %{buildroot}%{_bindir}/aclocal-1.$i +done %__rm -f %{buildroot}/%{_infodir}/* %__install -m 644 doc/%{name}.info* %{buildroot}/%{_infodir}/ +%__install -c -m 755 %SOURCE100 %buildroot%_bindir/ %__mkdir_p %{buildroot}%{_datadir}/aclocal -%clean -%__rm -rf %{buildroot} - %pre if [ "$1" = 1 ]; then update-alternatives --remove automake %{_bindir}/automake-1.8 @@ -102,6 +94,7 @@ fi %doc AUTHORS ChangeLog NEWS README THANKS %{_bindir}/automake %{_bindir}/aclocal +%{_bindir}/fix-old-automake-files %{_bindir}/automake-%{amversion} %{_bindir}/aclocal-%{amversion} %{_bindir}/automake-1.8 @@ -115,8 +108,8 @@ fi %{_datadir}/automake* %{_infodir}/automake* %{_datadir}/aclocal* -%{_mandir}/man1/aclocal-1.13* +%{_mandir}/man1/aclocal-%{amversion}* %{_mandir}/man1/aclocal.1* -%{_mandir}/man1/automake-1.13* +%{_mandir}/man1/automake-%{amversion}* %{_mandir}/man1/automake.1* diff --git a/fix-old-automake-files b/fix-old-automake-files new file mode 100644 index 0000000..08444af --- /dev/null +++ b/fix-old-automake-files @@ -0,0 +1,13 @@ +#!/bin/bash +if [ "$1" = "--fix-ac-defun" ]; then + # add missing brackets to AC_DEFUN statements, needed for automake >= 1.12 + # Optional because that breaks some rather obscure stripts like gnulib's iconv detection + # and by now most packages have been fixed. + find . -name "*.ac" -o -name "*.m4" -o -name configure.in |xargs perl -pi -e 's%(AC_DEFUN\s*\(\s*)([^,[]+)%\1\[\2\]%' +fi +# change AM_CONFIG_HEADER to AC_CONFIG_HEADERS, needed for automake >= 1.13 +find . -name configure.ac -o -name configure.in |xargs sed -i -e "s,AM_CONFIG_HEADER(,AC_CONFIG_HEADERS(,g" +# Rename configure.in to configure.ac, for autoconv >= 2.70, automake >= 2.0 +find . -name configure.in |while read r; do + mv $r ${r/configure.in/configure.ac} +done