- updated to 1.16

- updated no_versioned_dir patch

diff --git a/automake-no_versioned_dir.patch b/automake-no_versioned_dir.patch
index 15c6db07d50d3b1f353b84eca16deeb968a877d8..41de1d2716c30f4daa744bd430bfa8449909cdc5 100644 (file)
--- a/automake-no_versioned_dir.patch
+++ b/automake-no_versioned_dir.patch
@@ -1,33 +1,33 @@
---- 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 @@
+--- automake-1.16/bin/automake.in.orig 2018-03-03 08:01:09.987847780 +0100
++++ automake-1.16/bin/automake.in      2018-03-03 08:03:07.704513100 +0100
+@@ -31,7 +31,7 @@
  
  BEGIN
  {
--  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-+  @Automake::perl_libdirs = ('@datadir@/@PACKAGE@')
-     unless @Automake::perl_libdirs;
-   unshift @INC, @Automake::perl_libdirs;
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  
---- 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
+   # Override SHELL.  This is required on DJGPP so that system() uses
+--- automake-1.16/bin/aclocal.in.orig  2018-03-03 08:01:09.991181113 +0100
++++ automake-1.16/bin/aclocal.in       2018-03-03 08:04:06.407845767 +0100
 @@ -27,7 +27,7 @@
  
  BEGIN
  {
--  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
-+  @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@')
-     unless @Aclocal::perl_libdirs;
-   unshift @INC, @Aclocal::perl_libdirs;
+-  unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
++  unshift (@INC, '@datadir@/@PACKAGE@')
+     unless $ENV{AUTOMAKE_UNINSTALLED};
  }
---- 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
+ 
+--- automake-1.16/lib/Automake/Config.in.orig  2018-03-03 08:01:09.991181113 +0100
++++ automake-1.16/lib/Automake/Config.in       2018-03-03 08:04:36.151178758 +0100
 @@ -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 $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
++our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@';
  
  our $perl_threads = 0;
  # We need at least this version for CLONE support.

diff --git a/automake.spec b/automake.spec
index de8c887166c1842d788de7fdf1c8bac00173e963..f0d0e78c3ab73f5f14b0c2fc34fbeaf6e17adfc0 100644 (file)
--- 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.15.1
+Version:       1.16
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 24cd3501b6ad8cd4d7e2546f07e8b4d4
+# Source0-md5: bfdf69ac36c327b3a59b83ab01057e30
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
@@ -126,16 +126,12 @@ ln -s ../m4/[!a]*.m4 ../m4/a[!m]*.m4 .
 %{__automake}
 %endif
 
-# NOTE: _target macro becames "noarch" if ./builder passes --target=noarch, so
-# be sure use plain /usr/bin/rpmbuild.
 %configure \
-%if %{_host_cpu} == "x32"
-       --host=%{_target_platform} \
-       --build=%{_target_platform}
-%else
+%if "%{_host_cpu}" != "x32"
        --host=%{_host} \
-       --build=%{_host}
+       --build=%{_host} \
 %endif
+       --disable-silent-rules
 %{__make}
 
 %install