[packages/automake] - updated to 0.17; bootstrap release 0.1
qboosh
qboosh at pld-linux.org
Sat Aug 24 14:25:35 CEST 2024
commit 93c98ca7e1c151898f99e76a2f2815d41b156134
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Aug 24 13:40:10 2024 +0200
- updated to 0.17; bootstrap release 0.1
automake-info.patch | 90 ++++++++++++++++++++++++----------------
automake.spec | 14 +++----
revert-debian-python-hacks.patch | 40 +++++++++++++-----
3 files changed, 92 insertions(+), 52 deletions(-)
---
diff --git a/automake.spec b/automake.spec
index e68c1fc..a483fe7 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_with bootstrap # without full regeneration
+%bcond_with bootstrap # no full regeneration, for bootstrapping new version
Summary: GNU automake - Makefile configuration tools
Summary(de.UTF-8): GNU automake - Makefile-Konfigurationstools
@@ -13,22 +13,22 @@ 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.5
-Release: 3
+Version: 1.17
+Release: 0.1
Epoch: 1
License: GPL v2+
Group: Development/Building
Source0: https://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
-# Source0-md5: 4017e96f89fca45ca946f1c5db6be714
+# Source0-md5: 7ab3a02318fee6f5bd42adfc369abf10
Patch0: %{name}-info.patch
Patch1: %{name}-man.patch
Patch2: %{name}-no_versioned_dir.patch
Patch3: revert-debian-python-hacks.patch
Patch4: python-3.10.patch
-URL: http://sources.redhat.com/automake/
-BuildRequires: autoconf >= 2.69
+URL: http://www.gnu.org/software/automake/
+BuildRequires: autoconf >= 2.72
%if %{without bootstrap}
-BuildRequires: automake >= 1:1.14
+BuildRequires: automake >= 1:1.17
%endif
BuildRequires: help2man
BuildRequires: rpm-perlprov
diff --git a/automake-info.patch b/automake-info.patch
index 31efab5..e755c93 100644
--- a/automake-info.patch
+++ b/automake-info.patch
@@ -1,5 +1,5 @@
---- automake-1.16.5/doc/automake.texi.orig 2021-10-01 21:30:59.000000000 +0200
-+++ automake-1.16.5/doc/automake.texi 2021-11-30 22:10:34.118232059 +0100
+--- automake-1.17/doc/automake.texi.orig 2024-07-12 07:04:24.000000000 +0200
++++ automake-1.17/doc/automake.texi 2024-08-24 10:30:39.326896620 +0200
@@ -38,15 +38,11 @@ section entitled ``GNU Free Documentatio
@end quotation
@end copying
@@ -37,8 +37,22 @@
+* aclocal:: Auto-generating aclocal.m4
* Macros:: Autoconf macros supplied with Automake
- Auto-generating aclocal.m4
-@@ -1696,7 +1692,7 @@ registered with @code{AC_CONFIG_HEADERS}
+ Auto-generating aclocal.m4: Invoking @command{aclocal}
+@@ -1598,11 +1594,11 @@ which order all of these tools should be
+ curious: the basic idea is to run:
+
+ @enumerate
+- at item @command{aclocal} (@pxref{aclocal Invocation}),
++ at item @command{aclocal} (@pxref{aclocal}),
+ @item @command{autoconf} (@pxref{,,,autoconf, The Autoconf Manual}),
+ @item (if needed) @command{autoheader} (part of the
+ Autoconf distribution), and
+- at item @command{automake} (@pxref{automake Invocation}).
++ at item @command{automake} (@pxref{automake}).
+ @end enumerate
+
+ @noindent
+@@ -1725,7 +1721,7 @@ registered with @code{AC_CONFIG_HEADERS}
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,16 +61,16 @@
@command{autoscan} to Create @file{configure.ac}, autoconf, The
Autoconf Manual}).
-@@ -2583,7 +2579,7 @@ with different flags. In this instance,
+@@ -2612,7 +2608,7 @@ with different flags. In this instance,
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.)
- at node automake Invocation
+ at node automake
- @chapter Creating a @file{Makefile.in}
+ @chapter Creating a @file{Makefile.in}: Invoking @command{automake}
@c This node used to be named "Invoking automake". This @anchor
@c allows old links to still work.
-@@ -2851,7 +2847,7 @@ easier. These macros can automatically
+@@ -2880,7 +2876,7 @@ easier. These macros can automatically
@menu
* Requirements:: Configuration requirements
* Optional:: Other things Automake recognizes
@@ -65,7 +79,7 @@
* Macros:: Autoconf macros supplied with Automake
@end menu
-@@ -3241,11 +3237,11 @@ appear as dependencies in @file{Makefile
+@@ -3271,11 +3267,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
@@ -76,10 +90,19 @@
- at node aclocal Invocation
+ at node aclocal
- @section Auto-generating aclocal.m4
- @c This node used to be named "Invoking automake". This @anchor
+ @section Auto-generating aclocal.m4: Invoking @command{aclocal}
+ @c This node used to be named "Invoking aclocal". This @anchor
@c allows old links to still work.
-@@ -3435,7 +3431,7 @@ All warnings are output by default.
+@@ -3341,7 +3337,7 @@ overridden using the @env{AUTOM4TE} envi
+
+ In practice it is usually simpler to run @command{autoreconf} instead
+ of worrying about the required order of the various tools
+-(@pxref{autoreconf Invocation, , Using @command{autoreconf}, autoconf,
++(@pxref{autoreconf, , Using @command{autoreconf}, autoconf,
+ The Autoconf Manual}).
+
+ This section explains the details of @command{aclocal}.
+@@ -3489,7 +3485,7 @@ All warnings are output by default.
@vindex WARNINGS
The environment variable @env{WARNINGS} is honored in the same
@@ -88,7 +111,7 @@
@end table
-@@ -4191,8 +4187,8 @@ Although using some of the following mac
+@@ -4240,8 +4236,8 @@ Although using some of the following mac
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
@@ -99,7 +122,7 @@
@file{configure.ac}, autoconf, The Autoconf Manual}).
@emph{Do it NOW!}
-@@ -5585,7 +5581,7 @@ aforementioned linking flags should be l
+@@ -5633,7 +5629,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}
@@ -108,16 +131,27 @@
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.
-@@ -5658,7 +5654,7 @@ this issue because older Automake versio
+@@ -5707,7 +5703,7 @@ this issue because older Automake versio
Since Automake 1.6, it has been decided that running
- @command{libtoolize} was none of Automake's business. Instead, that
+ @command{libtoolize} was not Automake's business. Instead, that
functionality has been moved into the @command{autoreconf} command
-(@pxref{autoreconf Invocation, , Using @command{autoreconf}, autoconf,
+(@pxref{autoreconf, , Using @command{autoreconf}, autoconf,
- 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} or @file{autogen.sh} scripts by
-@@ -10712,7 +10708,7 @@ will be suppressed.
+ The Autoconf Manual}). The @command{autoreconf} command saves you
+ from having to figure out which infrastructure scripts to run in what
+ order. Augmenting existing @file{bootstrap} or @file{autogen.sh}
+@@ -5727,8 +5723,8 @@ missing from @file{configure.ac}; it can
+ The second reason is more complicated: if you've installed Automake
+ under a separate prefix, Automake cannot know where to find the
+ @code{LT_INIT} macro. Automake looks in the @file{aclocal.m4} file,
+-which is generated by the @command{aclocal} command (@pxref{aclocal
+-Invocation}). But since the default search paths for @command{aclocal}
++which is generated by the @command{aclocal} command (@pxref{aclocal}).
++But since the default search paths for @command{aclocal}
+ are based on where it is installed (@pxref{Macro Search Path}), if
+ Automake is installed in one place (e.g., because it's for a test
+ release), and Libtool in another (e.g., for general system use),
+@@ -11202,7 +11198,7 @@ will be suppressed.
@cindex Option, @option{-W at var{category}}
@cindex Option, @option{--warnings=@var{category}}
These options behave exactly like their command-line counterpart
@@ -126,7 +160,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}.
-@@ -11439,7 +11435,7 @@ These overriding semantics make it possi
+@@ -12010,7 +12006,7 @@ These overriding semantics make it possi
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}
@@ -135,7 +169,7 @@
definitions.
Note that Automake does not make any distinction between rules with
-@@ -11896,7 +11892,7 @@ autoreconf -vfi
+@@ -12466,7 +12462,7 @@ autoreconf -vfi
@end example
The use of @option{--force-missing} ensures that auxiliary tools will be
@@ -144,17 +178,3 @@
It is important to regenerate all of these files each time Automake is
upgraded, even between bug fix releases. For instance, it is not
---- automake-1.16.3/doc/automake-history.texi.orig 2020-11-19 02:21:03.000000000 +0100
-+++ automake-1.16.3/doc/automake-history.texi 2021-01-10 12:24:21.033358854 +0100
-@@ -23,9 +23,9 @@
- @end quotation
- @end copying
-
-- at dircategory Software development
-+ at dircategory Programming tools:
- @direntry
--* Automake-history: (automake-history). History of Automake development.
-+* Automake-history: (automake-history). History of Automake development
- @end direntry
-
- @titlepage
diff --git a/revert-debian-python-hacks.patch b/revert-debian-python-hacks.patch
index 3719886..b240e15 100644
--- a/revert-debian-python-hacks.patch
+++ b/revert-debian-python-hacks.patch
@@ -6,11 +6,9 @@ Date: Sun Apr 24 10:28:38 2016 +0200
This reverts commit 1f113f6bc81edabbbda7e14d58b10ac02d7a1137.
-diff --git a/m4/python.m4 b/m4/python.m4
-index 32c30e2..5c58851 100644
---- a/m4/python.m4
-+++ b/m4/python.m4
-@@ -216,26 +216,6 @@ AC_DEFUN([AM_PATH_PYTHON],
+--- automake-1.17/m4/python.m4.orig 2024-08-24 10:30:55.673474729 +0200
++++ automake-1.17/m4/python.m4 2024-08-24 10:38:08.461130117 +0200
+@@ -219,40 +219,6 @@ AC_DEFUN([AM_PATH_PYTHON],
# Substituting python_exec_prefix_subst.
AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst])
@@ -32,19 +30,37 @@ index 32c30e2..5c58851 100644
- if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
- can_use_sysconfig = 0
-except ImportError:
-- pass"
+- pass" # end of am_python_setup_sysconfig
+-
+- # More repeated code, for figuring out the installation scheme to use.
+- am_python_setup_scheme="if hasattr(sysconfig, 'get_default_scheme'):
+- scheme = sysconfig.get_default_scheme()
+- else:
+- scheme = sysconfig._get_default_scheme()
+- if scheme == 'posix_local':
+- if '$am_py_prefix' == '/usr':
+- scheme = 'deb_system' # should only happen during Debian package builds
+- else:
+- # Debian's default scheme installs to /usr/local/ but we want to
+- # follow the prefix, as we always have.
+- # See bugs#54412, #64837, et al.
+- scheme = 'posix_prefix'" # end of am_python_setup_scheme
-
dnl emacs-page Set up 4 directories:
dnl 1. pythondir: where to install python scripts. This is the
-@@ -251,14 +231,7 @@ except ImportError:
+@@ -268,18 +234,7 @@ except ImportError:
else
am_py_prefix=$am_cv_python_prefix
fi
- am_cv_python_pythondir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+- try:
+- $am_python_setup_scheme
+- sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
+- except:
+- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
@@ -53,14 +69,18 @@ index 32c30e2..5c58851 100644
#
case $am_cv_python_pythondir in
$am_py_prefix*)
-@@ -293,14 +266,7 @@ sys.stdout.write(sitedir)"`
+@@ -315,18 +270,7 @@ sys.stdout.write(sitedir)"`
else
am_py_exec_prefix=$am_cv_python_exec_prefix
fi
- am_cv_python_pyexecdir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+- try:
+- $am_python_setup_scheme
+- sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
+- except:
+- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
-else:
- from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/automake.git/commitdiff/93c98ca7e1c151898f99e76a2f2815d41b156134
More information about the pld-cvs-commit
mailing list