diff --git a/0001-correct-parameter-parsing-in-test-driver-script.patch b/0001-correct-parameter-parsing-in-test-driver-script.patch deleted file mode 100644 index 3fd7e9a..0000000 --- a/0001-correct-parameter-parsing-in-test-driver-script.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ba1172154da6739f9bf9e11c93f2abbb90a226ac Mon Sep 17 00:00:00 2001 -From: Thomas Blume -Date: Tue, 14 Jun 2016 14:45:42 +0200 -Subject: [PATCH] correct parameter parsing in test-driver script - -The help text suggest using an equal sign for assigning parameter values -but the code only supports spaces. -The patch adds support for both. ---- - lib/test-driver | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -Index: automake-1.16.3/lib/test-driver -=================================================================== ---- automake-1.16.3.orig/lib/test-driver -+++ automake-1.16.3/lib/test-driver -@@ -64,22 +64,27 @@ expect_failure=no - color_tests=no - collect_skipped_logs=yes - enable_hard_errors=yes --while test $# -gt 0; do -- case $1 in -+while test $# -gt 1; do -+ arg=${1%=*} -+ val=${1#*=} -+ if [ $arg = $val ]; then -+ val=$2 -+ shift -+ fi -+ case $arg in - --help) print_usage; exit $?;; - --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;; -- --test-name) test_name=$2; shift;; -- --log-file) log_file=$2; shift;; -- --trs-file) trs_file=$2; shift;; -- --color-tests) color_tests=$2; shift;; -- --collect-skipped-logs) collect_skipped_logs=$2; shift;; -- --expect-failure) expect_failure=$2; shift;; -- --enable-hard-errors) enable_hard_errors=$2; shift;; -- --) shift; break;; -+ --test-name) test_name=$val;; -+ --log-file) log_file=$val;; -+ --trs-file) trs_file=$val;; -+ --color-tests) color_tests=$val;; -+ --collect-skipped-logs) collect_skipped_logs=$val;; -+ --expect-failure) expect_failure=$val;; -+ --enable-hard-errors) enable_hard_errors=$val;; -+ --) break;; - -*) usage_error "invalid option: '$1'";; -- *) break;; - esac -- shift -+ [ $arg != $val ] && shift - done - - missing_opts= diff --git a/automake-1.17.tar.xz b/automake-1.17.tar.xz deleted file mode 100644 index 88b0536..0000000 --- a/automake-1.17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990 -size 1652632 diff --git a/automake-1.17.tar.xz.sig b/automake-1.17.tar.xz.sig deleted file mode 100644 index d4a070b..0000000 --- a/automake-1.17.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmaQvW4ACgkQf9n8ywAL -7u7+WA/9EezHCJlBRweh9SWSA9GFKWpZ0UCGWHOi98bUCglxnuiSCfK5hsV5iw2Z -JRvKujnP/0fKFjkHoQF0HLYGgSEKp9NOH5efurqd1XexGhpgtt9vsHLxukOWFnp7 -eoWOUw0q2OYat9ENunxfi5w06mdOL2QS6u6IcimYQO//XWb38lqxTs5SY617YbIk -dzhsE8E9Tk137NSsJPtopIDStMahz6B29wPgWBS4BiPwzyLMeANYudmt1epQjW/d -xkW131Pe/pDwuRs89eVMDXBVroVv+kv1Dqzm9byXOQFLsjSRLV6Ej83narg+wlUf -h4UFXIBHoyHh7k0zXIpPXje9td6hCankmEFnn52yOR1h9fFQ1gse4XGqan2AR/LK -qlWVDbfzeplUc+t6jd4WKA+q2NI3XzUk020SiMbGmsmE1EKCOfTaMGDHdOK/bdEy -DhN5rpqsK4fP5G1sJ0EXwNcyVTU9Sv91Lg7pohIv3W0JkyqLqT6D53Owc9FD05wI -Oit5V64XFdYZ989L5UXZbe+AD3FPnZoOBpSqSXpA1Ifi3BZrGDyiK5uaUgDKnc44 -BQvNeUGjCpRu4fNPPhSfuqaKjqUCm4PKwymtGA8ZC1QSVmTNdyJfn1V5WqWk2dLe -EpoPY9Yz0UtOvIcbwm6YqzzdX8Rbgy6Io24ooxDFckqupx232Ng= -=Agm1 ------END PGP SIGNATURE----- diff --git a/automake-1.18.1.tar.xz b/automake-1.18.1.tar.xz new file mode 100644 index 0000000..ced25d0 --- /dev/null +++ b/automake-1.18.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:168aa363278351b89af56684448f525a5bce5079d0b6842bd910fdd3f1646887 +size 1652392 diff --git a/automake-1.18.1.tar.xz.sig b/automake-1.18.1.tar.xz.sig new file mode 100644 index 0000000..593223a --- /dev/null +++ b/automake-1.18.1.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEF9MxGxS8DySCZ78CBxZ0ijDRVa0FAmhds1YACgkQBxZ0ijDR +Va2JLAf+I3CH3G3/7d1F4tIEKFjk7py6TbceXQumg+9nACo7tKoaxKDvVhVEKnCi +bymNAidvKWYmiKcF6C3C0c5x6DyTSIjWO4S+g93aUSfzgN8ipLAjUvKnxl3ePtiV +ivhr5X4Nwx0FwW6OF8HB3/ejRJCdfpmFirNKAo4DbEfg/mrpO9HP5NFqAexvgUuM +bOucHcrHiTGAnvTlzlChEOHpjZzNa00hJNbv/i93VOI+inyFPIPq1H8cnEnYkMoP ++rT4+Qlisw8MIq9rG+kjTHxne5GDfccIheywSEuLfxsMzUIUXjHg4v8RMMxTri50 +ufd58lhAsw6za9Q9fjK75ByfJCOeYg== +=aNPf +-----END PGP SIGNATURE----- diff --git a/automake.changes b/automake.changes index bd4eafd..0a3a0da 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Jun 27 05:44:11 UTC 2025 - Christoph G + +- update to 1.18.1 + - Undo change to mdate-sh; once again, it does not look at + SOURCE_DATE_EPOCH. This change was a misunderstanding that causes + problems, not fixes, for reproducible builds. + - Improve debuggability of installcheck failures. + +------------------------------------------------------------------- +Wed Jun 4 09:42:26 UTC 2025 - Valentin Lefebvre + +- Get the latest automake.keyring from Savannah, including new key used to + sign the sources. + +------------------------------------------------------------------- +Tue Jun 3 20:55:21 UTC 2025 - Christoph G + +- test-driver don't use equal sign for assigning parameter, upstream well + documented to use only spaces. See commit: + 6cfd9401c5d6b4a6fce1318d50a6ec34fdd4799a + * Drop 0001-correct-parameter-parsing-in-test-driver-script.patch + +------------------------------------------------------------------- +Wed May 28 17:59:59 UTC 2025 - Christoph G + +- update to 1.18 + * Default tar format is now ustar, mainly to support longer + filenames; the tar-v7 and other explicit options to force a + particular tar format are unchanged and still override the + default. + * The mdate-sh auxiliary script generally used with Texinfo now + uses SOURCE_DATE_EPOCH, if set, instead of the source file's + mtime. + * New option dist-bzip3 for bzip3 compression of distributions. + * New option --stderr-prefix for tap-driver.sh, to prefix each + line of stderr from a test script with a given string. + * Support for Algol 68 added, based on the GNU Algol 68 + compiler. +- Do not call bootstrap script, as it triggers an texinfo run. + ------------------------------------------------------------------- Fri Jul 12 17:18:39 UTC 2024 - Christoph G diff --git a/automake.keyring b/automake.keyring index 3bafcf5..1306213 100644 --- a/automake.keyring +++ b/automake.keyring @@ -3635,3 +3635,63 @@ LfnCUezmdRdxQa0vljTM4+mIhbZVQBH6ZKXwv5IJ5DiS2XdsPx0p87PCWTaYKKjZ dJu2rMPff+h8UjA= =lsRc -----END PGP PUBLIC KEY BLOCK----- + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +Qg== +=/kap +-----END PGP PUBLIC KEY BLOCK----- diff --git a/automake.spec b/automake.spec index 43ab7e1..c85fd0f 100644 --- a/automake.spec +++ b/automake.spec @@ -1,7 +1,7 @@ # # spec file for package automake # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %define nsuffix %{nil} %endif Name: automake%{nsuffix} -Version: 1.17 +Version: 1.18.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT @@ -38,7 +38,6 @@ Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig # taken from https://savannah.gnu.org/project/release-gpgkeys.php?group=automake&download=1 Source2: automake.keyring Source3: automake-rpmlintrc -Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch Patch100: automake-suse-vendor.patch BuildRequires: autoconf >= 2.69 BuildRequires: bison @@ -86,14 +85,13 @@ definitions (with rules occasionally thrown in). The generated %autopatch -p1 %build -sh bootstrap %configure --docdir=%{_docdir}/%{name} -%make_build #%%{?_smp_mflags} +%make_build %if "%{flavor}" == "testsuite" %check # Some architectures can't keep up the pace. -%ifnarch alpha %{arm} +%ifnarch %{arm} %make_build check %endif @@ -108,7 +106,6 @@ ln -s %{_sysconfdir}/aclocal_dirlist %{buildroot}%{_datadir}/aclocal/dirlist install -m644 AUTHORS ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} # info's dir file is not auto ignored on some systems rm -rf %{buildroot}%{_infodir}/dir -#name == automake %endif %post