From 780166fe2e3e142f52723755fc54255a8f6a0dca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 24 Mar 2020 22:56:19 +0100 Subject: [PATCH] - up to 1.16.2 --- automake-info.patch | 10 +++++----- automake-morearchs.patch | 15 --------------- automake.spec | 8 ++++---- 3 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 automake-morearchs.patch diff --git a/automake-info.patch b/automake-info.patch index b8e665b..0aa9246 100644 --- a/automake-info.patch +++ b/automake-info.patch @@ -65,12 +65,12 @@ * Macros:: Autoconf macros supplied with Automake @end menu -@@ -3119,11 +3115,11 @@ +@@ -3127,11 +3127,11 @@ appear as dependencies in @file{Makefile @code{m4_include} is seldom used by @file{configure.ac} authors, but can appear in @file{aclocal.m4} when @command{aclocal} detects that some required macros come from files local to your package (as opposed to --macros installed in a system-wide directory, @pxref{aclocal Invocation}). -+macros installed in a system-wide directory, @pxref{aclocal}). +-macros installed in a system-wide directory; @pxref{aclocal Invocation}). ++macros installed in a system-wide directory; @pxref{aclocal}). @end ftable @@ -99,13 +99,13 @@ @file{configure.ac}, autoconf, The Autoconf Manual}). @emph{Do it NOW!} -@@ -5453,7 +5449,7 @@ +@@ -5475,7 +5475,7 @@ aforementioned linking flags should be l passed to the tool invoked by @command{libtool} (hence the use of @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic options include @option{--tag=@var{tag}} and @option{--silent} -(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The +(@pxref{libtool, , Invoking @command{libtool}, libtool, The - Libtool Manual} for more options) should appear before the mode + Libtool Manual} for more options). They should appear before the mode selection on the command line; in @file{Makefile.am}s they should be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable. @@ -5526,7 +5522,7 @@ diff --git a/automake-morearchs.patch b/automake-morearchs.patch deleted file mode 100644 index 6d1c1d5..0000000 --- a/automake-morearchs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- automake-1.15.1/lib/config.sub.orig 2017-06-20 16:43:35.596510193 +0200 -+++ automake-1.15.1/lib/config.sub 2017-06-20 17:09:44.756492278 +0200 -@@ -1037,6 +1037,12 @@ - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ ppc74[05]0) -+ basic_machine=powerpc-unknown -+ ;; -+ ppc74[05]0-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown - ;; diff --git a/automake.spec b/automake.spec index 0076a99..dbbdbc7 100644 --- a/automake.spec +++ b/automake.spec @@ -13,17 +13,17 @@ 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.16.1 +Version: 1.16.2 Release: 1 Epoch: 1 License: GPL v2+ Group: Development/Building Source0: http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz -# Source0-md5: 53f38e7591fa57c3d2cee682be668e5b +# Source0-md5: 6cb234c86f3f984df29ce758e6d0d1d7 Patch0: %{name}-info.patch Patch1: %{name}-man.patch Patch2: %{name}-no_versioned_dir.patch -Patch3: %{name}-morearchs.patch + Patch4: revert-debian-python-hacks.patch URL: http://sources.redhat.com/automake/ BuildRequires: autoconf >= 2.69 @@ -106,7 +106,7 @@ Makefile'ів. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 + %patch4 -p1 %if %{without bootstrap} -- 2.44.0