From 40d403eb6592f761eb322478361ed89e53c24a65 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 24 Jun 2013 18:36:18 +0200 Subject: [PATCH] - updated to 1.14 (1.13.x left on automake-1.13 branch; note: first build requires --with bootstrap) - updated no_versioned_dir patch --- automake-no_versioned_dir.patch | 16 ++++++++-------- automake.spec | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch index 23fc42d..15c6db0 100644 --- a/automake-no_versioned_dir.patch +++ b/automake-no_versioned_dir.patch @@ -1,5 +1,5 @@ ---- automake-1.12.5/automake.in.orig 2012-11-22 17:36:51.560603115 +0100 -+++ automake-1.12.5/automake.in 2012-11-22 18:18:52.190550575 +0100 +--- automake-1.14/bin/automake.in.orig 2012-11-22 17:36:51.560603115 +0100 ++++ automake-1.14/bin/automake.in 2012-11-22 18:18:52.190550575 +0100 @@ -29,7 +29,7 @@ BEGIN @@ -9,8 +9,8 @@ unless @Automake::perl_libdirs; unshift @INC, @Automake::perl_libdirs; ---- automake-1.12.5/aclocal.in.orig 2012-11-22 17:36:51.597269780 +0100 -+++ automake-1.12.5/aclocal.in 2012-11-22 18:19:11.647216837 +0100 +--- automake-1.14/bin/aclocal.in.orig 2012-11-22 17:36:51.597269780 +0100 ++++ automake-1.14/bin/aclocal.in 2012-11-22 18:19:11.647216837 +0100 @@ -27,7 +27,7 @@ BEGIN @@ -20,14 +20,14 @@ unless @Aclocal::perl_libdirs; unshift @INC, @Aclocal::perl_libdirs; } ---- automake-1.12.1/lib/Automake/Config.in.orig 2012-06-01 15:47:09.000000000 +0200 -+++ automake-1.12.1/lib/Automake/Config.in 2012-06-03 07:49:50.581740616 +0200 +--- automake-1.14/lib/Automake/Config.in.orig 2013-06-24 17:34:25.598771336 +0200 ++++ automake-1.14/lib/Automake/Config.in 2013-06-24 17:35:31.062101922 +0200 @@ -32,7 +32,7 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; our $VERSION = '@VERSION@'; our $RELEASE_YEAR = '@RELEASE_YEAR@'; -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; +our $libdir = '@datadir@/@PACKAGE@'; - our $perl_threads = @PERL_THREADS@; - 1; + our $perl_threads = 0; + # We need at least this version for CLONE support. diff --git a/automake.spec b/automake.spec index 3413b6d..99fa701 100644 --- a/automake.spec +++ b/automake.spec @@ -14,13 +14,13 @@ Summary(ru.UTF-8): GNU automake - инструменты для автомати Summary(tr.UTF-8): Makefile yapılandırma araçları Summary(uk.UTF-8): GNU automake - інструменти для автоматичної генерації Makefile'ів Name: automake -Version: 1.13.4 +Version: 1.14 Release: 1 Epoch: 1 License: GPL v2+ Group: Development/Building Source0: http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz -# Source0-md5: 71b03c1bc4f587add12604587d9276d1 +# Source0-md5: cb3fba6d631cddf12e230fd0cc1890df Patch0: %{name}-info.patch Patch1: %{name}-man.patch Patch2: %{name}-no_versioned_dir.patch @@ -28,7 +28,7 @@ Patch3: %{name}-morearchs.patch URL: http://sources.redhat.com/automake/ BuildRequires: autoconf >= 2.69 %if %{without bootstrap} -BuildRequires: automake >= 1:1.11 +BuildRequires: automake >= 1:1.14 %endif BuildRequires: help2man BuildRequires: rpm-perlprov @@ -162,11 +162,11 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/automake.info* %{_infodir}/automake-history.info* %{_mandir}/man1/aclocal.1* -%{_mandir}/man1/aclocal-1.13.1* +%{_mandir}/man1/aclocal-1.14.1* %{_mandir}/man1/automake.1* -%{_mandir}/man1/automake-1.13.1* +%{_mandir}/man1/automake-1.14.1* -%{_datadir}/aclocal-* +%{_datadir}/aclocal-1.14 %dir %{_datadir}/automake %{_datadir}/automake/am %{_datadir}/automake/Automake -- 2.44.0