[packages/automake] - updated to 1.13.1 (note: some backward compatibility macros/options have been dropped; automake
qboosh
qboosh at pld-linux.org
Wed Jan 2 18:56:51 CET 2013
commit 70921c598f272b0fb4036f3922a7db26f5d3eb6d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jan 2 18:56:45 2013 +0100
- updated to 1.13.1 (note: some backward compatibility macros/options have been dropped;
automake 1.12.x left on automake-1.12 branch)
- updated info patch
automake-info.patch | 55 +++++++++++++++--------------------------------------
automake.spec | 20 +++++++++----------
2 files changed, 24 insertions(+), 51 deletions(-)
---
diff --git a/automake.spec b/automake.spec
index 6fa9612..c00466f 100644
--- a/automake.spec
+++ b/automake.spec
@@ -14,28 +14,26 @@ 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.12.6
+Version: 1.13.1
Release: 1
Epoch: 1
License: GPL v2+
Group: Development/Building
Source0: http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 140e084223bf463a24c1a28427c6aec7
+# Source0-md5: a60380ab11e1481376b7747d1b42ced2
Patch0: %{name}-info.patch
Patch1: %{name}-man.patch
Patch2: %{name}-no_versioned_dir.patch
Patch3: %{name}-morearchs.patch
URL: http://sources.redhat.com/automake/
-%if %{with bootstrap}
-BuildRequires: autoconf >= 2.62
-%else
-BuildRequires: autoconf >= 2.68
+BuildRequires: autoconf >= 2.69
+%if %{without bootstrap}
BuildRequires: automake >= 1:1.10a
%endif
BuildRequires: help2man
BuildRequires: rpm-perlprov
BuildRequires: tar >= 1:1.22
-BuildRequires: texinfo >= 4.7
+BuildRequires: texinfo >= 4.9
BuildRequires: xz
Requires(pre): fileutils
Requires: filesystem >= 3.0-2
@@ -45,8 +43,9 @@ Requires: perl(File::Glob)
Requires: perl(Thread::Queue)
Requires: perl(threads)
%endif
-Conflicts: autoconf < 2.60
+Conflicts: autoconf < 2.65
Conflicts: libtool < 2:1.5-11
+Conflicts: texinfo < 4.9
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -163,9 +162,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/automake.info*
%{_infodir}/automake-history.info*
%{_mandir}/man1/aclocal.1*
-%{_mandir}/man1/aclocal-1.12.1*
+%{_mandir}/man1/aclocal-1.13.1*
%{_mandir}/man1/automake.1*
-%{_mandir}/man1/automake-1.12.1*
+%{_mandir}/man1/automake-1.13.1*
%{_datadir}/aclocal-*
%dir %{_datadir}/automake
@@ -179,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_datadir}/automake/config.guess
%attr(755,root,root) %{_datadir}/automake/config.sub
%attr(755,root,root) %{_datadir}/automake/depcomp
-%attr(755,root,root) %{_datadir}/automake/elisp-comp
%attr(755,root,root) %{_datadir}/automake/install-sh
%attr(755,root,root) %{_datadir}/automake/mdate-sh
%attr(755,root,root) %{_datadir}/automake/missing
diff --git a/automake-info.patch b/automake-info.patch
index 4bcf032..b8e665b 100644
--- a/automake-info.patch
+++ b/automake-info.patch
@@ -1,5 +1,5 @@
---- automake-1.12/doc/automake.texi.orig 2012-04-21 16:38:05.000000000 +0200
-+++ automake-1.12/doc/automake.texi 2012-05-09 15:48:51.421519783 +0200
+--- automake-1.13.1/doc/automake.texi.orig 2013-01-01 12:50:13.000000000 +0100
++++ automake-1.13.1/doc/automake.texi 2013-01-02 17:52:44.118274937 +0100
@@ -36,15 +36,11 @@
@end quotation
@end copying
@@ -29,7 +29,7 @@
* configure:: Scanning configure.ac, using aclocal
* Directories:: Declaring subdirectories
* Programs:: Building programs and libraries
-@@ -175,7 +171,7 @@
+@@ -174,7 +170,7 @@
* Requirements:: Configuration requirements
* Optional:: Other things Automake recognizes
@@ -38,7 +38,7 @@
* Macros:: Autoconf macros supplied with Automake
Auto-generating aclocal.m4
-@@ -1682,7 +1678,7 @@
+@@ -1680,7 +1676,7 @@
When starting a new project, we suggest you start with such a simple
@file{configure.ac}, and gradually add the other tests it requires.
The command @command{autoscan} can also suggest a few of the tests
@@ -47,7 +47,7 @@
@command{autoscan} to Create @file{configure.ac}, autoconf, The
Autoconf Manual}).
-@@ -2501,7 +2497,7 @@
+@@ -2488,7 +2484,7 @@
would be chosen by automake; they would be @file{false-true.o} and
@file{true-true.o}. (The name of the object files rarely matters.)
@@ -56,7 +56,7 @@
@chapter Creating a @file{Makefile.in}
@c This node used to be named "Invoking automake". This @anchor
@c allows old links to still work.
-@@ -2759,7 +2755,7 @@
+@@ -2737,7 +2733,7 @@
@menu
* Requirements:: Configuration requirements
* Optional:: Other things Automake recognizes
@@ -65,7 +65,7 @@
* Macros:: Autoconf macros supplied with Automake
@end menu
-@@ -3136,11 +3132,11 @@
+@@ -3119,11 +3115,11 @@
@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
@@ -79,7 +79,7 @@
@section Auto-generating aclocal.m4
@c This node used to be named "Invoking automake". This @anchor
@c allows old links to still work.
-@@ -3325,7 +3321,7 @@
+@@ -3308,7 +3304,7 @@
@vindex WARNINGS
The environment variable @env{WARNINGS} is honored in the same
@@ -88,23 +88,7 @@
@end table
-@@ -3633,12 +3629,12 @@
-
- @code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal}
- when @file{aclocal.m4} is to be rebuilt by @command{make}. This line is
--also used by @command{autoreconf} (@pxref{autoreconf Invocation, ,
-+also used by @command{autoreconf} (@pxref{autoreconf, ,
- Using @command{autoreconf} to Update @file{configure} Scripts,
- autoconf, The Autoconf Manual}) to run @command{aclocal} with suitable
--options, or by @command{autopoint} (@pxref{autopoint Invocation, ,
-+options, or by @command{autopoint} (@pxref{autopoint, ,
- Invoking the @command{autopoint} Program, gettext, GNU gettext tools})
--and @command{gettextize} (@pxref{gettextize Invocation, , Invoking the
-+and @command{gettextize} (@pxref{gettextize, , Invoking the
- @command{gettextize} Program, gettext, GNU gettext tools}) to locate
- the place where Gettext's macros should be installed. So even if you
- do not really care about the rebuild rules, you should define
-@@ -4081,8 +4077,8 @@
+@@ -4056,8 +4052,8 @@
releases, you should not use any of them in new code. @emph{All
these macros will be removed in the next major Automake version};
if you are still using them, running @command{autoupdate} should
@@ -115,7 +99,7 @@
@file{configure.ac}, autoconf, The Autoconf Manual}).
@emph{Do it NOW!}
-@@ -5462,7 +5458,7 @@
+@@ -5453,7 +5449,7 @@
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}
@@ -124,7 +108,7 @@
Libtool Manual} for more options) 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.
-@@ -5536,7 +5532,7 @@
+@@ -5526,7 +5522,7 @@
Since Automake 1.6, it has been decided that running
@command{libtoolize} was none of Automake's business. Instead, that
functionality has been moved into the @command{autoreconf} command
@@ -133,7 +117,7 @@
The Autoconf Manual}). If you do not want to remember what to run and
when, just learn the @command{autoreconf} command. Hopefully,
replacing existing @file{bootstrap.sh} or @file{autogen.sh} scripts by
-@@ -10296,7 +10292,7 @@
+@@ -10278,7 +10274,7 @@
@cindex Option, @option{-W at var{category}}
@cindex Option, @option{--warnings=@var{category}}
These options behave exactly like their command-line counterpart
@@ -142,16 +126,7 @@
warning categories on a per-file basis. You can also setup some warnings
for your entire project; for instance, try @samp{AM_INIT_AUTOMAKE([-Wall])}
in your @file{configure.ac}.
-@@ -10906,7 +10902,7 @@
- that is not required by POSIX 2008 but is widely supported in
- practice. The @option{silent-rules} option thus turns off warnings
- about recursive variable expansion, which are in turn enabled by
-- at option{-Wportability} (@pxref{automake Invocation}). On the rare
-+ at option{-Wportability} (@pxref{automake}). On the rare
- @command{make} implementations that do not support nested variable
- expansion, whether rules are silent is always determined at configure
- time, and cannot be overridden at make time. Future versions of POSIX
-@@ -11133,7 +11129,7 @@
+@@ -11051,7 +11047,7 @@
settings of Automake, or replace some of its rules. Overriding
Automake rules is often inadvisable, particularly in the topmost
directory of a package with subdirectories. The @option{-Woverride}
@@ -160,12 +135,12 @@
definitions.
Note that Automake does not make any distinction between rules with
-@@ -11581,7 +11577,7 @@
+@@ -11499,7 +11495,7 @@
@end example
The use of @option{--force-missing} ensures that auxiliary tools will be
-overridden by new versions (@pxref{automake Invocation}).
+overridden by new versions (@pxref{automake}).
- It is important to regenerate all these files each time Automake is
+ It is important to regenerate all of these files each time Automake is
upgraded, even between bug fixes releases. For instance, it is not
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/automake.git/commitdiff/70921c598f272b0fb4036f3922a7db26f5d3eb6d
More information about the pld-cvs-commit
mailing list