diff --git a/.gitignore b/.gitignore index 70ede9e..b01c175 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ /autoconf-archive-2021.02.19.tar.xz.sig /autoconf-archive-2022.02.11.tar.xz /autoconf-archive-2022.02.11.tar.xz.sig +/autoconf-archive-2022.09.03.tar.xz +/autoconf-archive-2022.09.03.tar.xz.sig diff --git a/autoconf-archive-2021.02.19-python_310.patch b/autoconf-archive-2021.02.19-python_310.patch deleted file mode 100644 index d4fcbf6..0000000 --- a/autoconf-archive-2021.02.19-python_310.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3c4b846823be9094fc3c3987e1b807741af6da3b Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 5 Aug 2021 11:12:47 -0400 -Subject: [PATCH 1/2] AX_PYTHON_DEVEL: fix for Python 3.10+ - ---- - m4/ax_python_devel.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index 9d4eecf7..d30ee943 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -208,7 +208,7 @@ EOD` - ac_python_version=$PYTHON_VERSION - else - ac_python_version=`$PYTHON -c "import sys; \ -- print (sys.version[[:3]])"` -+ print ("%d.%d" % sys.version_info[[:2]])"` - fi - fi - - -From 03c32bcc6763ff8b9a51f2b7e01f6862e61ef440 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 5 Aug 2021 11:27:24 -0400 -Subject: [PATCH 2/2] AX_PYTHON: Add 3.10 and 3.11 - ---- - m4/ax_python.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 -index 7c9f511f..c2577905 100644 ---- a/m4/ax_python.m4 -+++ b/m4/ax_python.m4 -@@ -55,7 +55,7 @@ - AC_DEFUN([AX_PYTHON], - [AC_MSG_CHECKING(for python build information) - AC_MSG_RESULT([]) --for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do -+for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do - AC_CHECK_PROGS(PYTHON_BIN, [$python]) - ax_python_bin=$PYTHON_BIN - if test x$ax_python_bin != x; then diff --git a/autoconf-archive-2022.02.11-m4-add-missing-to-end-of-case.patch b/autoconf-archive-2022.02.11-m4-add-missing-to-end-of-case.patch deleted file mode 100644 index a9b2ae4..0000000 --- a/autoconf-archive-2022.02.11-m4-add-missing-to-end-of-case.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c92672b9c59f9011e5d68220e99cfdd70c1b98df Mon Sep 17 00:00:00 2001 -From: Reuben Thomas -Date: Mon, 25 Apr 2022 12:37:10 +0100 -Subject: [PATCH] m4/ax_cc_maxopt.m4: add missing ;; to end of case - ---- - m4/ax_cc_maxopt.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/m4/ax_cc_maxopt.m4 b/m4/ax_cc_maxopt.m4 -index 05218e3..7ad5343 100644 ---- a/m4/ax_cc_maxopt.m4 -+++ b/m4/ax_cc_maxopt.m4 -@@ -55,7 +55,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 22 -+#serial 23 - - AC_DEFUN([AX_CC_MAXOPT], - [ -@@ -146,6 +146,7 @@ if test "x$ac_test_CFLAGS" = "x"; then - nvhpc) - # default optimization flags for nvhpc - CFLAGS="$CFLAGS -O3" -+ ;; - - gnu) - # default optimization flags for gcc on all systems --- -2.35.3 - diff --git a/autoconf-archive.spec b/autoconf-archive.spec index 0b7c430..c8dcf80 100644 --- a/autoconf-archive.spec +++ b/autoconf-archive.spec @@ -1,6 +1,6 @@ Name: autoconf-archive -Version: 2022.02.11 -Release: 3%{?dist} +Version: 2022.09.03 +Release: 1%{?dist} Summary: The Autoconf Macro Archive License: GPLv3+ with exceptions URL: https://www.gnu.org/software/autoconf-archive/ @@ -14,12 +14,6 @@ BuildRequires: gnupg2 BuildRequires: make Requires: autoconf -# Add support for Python 3.10 -Patch0: autoconf-archive-2021.02.19-python_310.patch - -# upstream: https://github.com/autoconf-archive/autoconf-archive/commit/c92672b9c59f9011e5d68220e99cfdd70c1b98df -Patch1: autoconf-archive-2022.02.11-m4-add-missing-to-end-of-case.patch - %description The GNU Autoconf Archive is a collection of more than 450 macros for GNU Autoconf that have been contributed as free software by friendly @@ -47,6 +41,9 @@ rm -frv %{buildroot}%{_datadir}/doc/%{name} %{_infodir}/autoconf-archive.info* %changelog +* Tue Sep 27 2022 Frederic Berat - 2022.09.03-1 +- Update to 2022.09.03 + * Wed Jul 20 2022 Fedora Release Engineering - 2022.02.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 62d4503..4bf3219 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (autoconf-archive-2022.02.11.tar.xz) = 243e06a356ea2c0fddc527febd4241da49fe4c11fb64b548873744a54e079860739d7a1da842833b99540acde3f6a2ebfddc41897306cc2e61e2c6037a7d22ff -SHA512 (autoconf-archive-2022.02.11.tar.xz.sig) = a4999e1f0fb178df8b840f2790ae9f2a26eed16ee9193b710d69f808c904a98aec9e118c156109a7727c8c86c342a8294ab4fb3d5b1e391bd7af33a5c92b7351 +SHA512 (autoconf-archive-2022.09.03.tar.xz) = 157b5b6a979d5ec5bfab6ddf34422da620fec1e95f4c901821abbb7361544af77747b4a449029b84750d75679d6130a591e98da8772de2c121ecdea163f0340b +SHA512 (autoconf-archive-2022.09.03.tar.xz.sig) = d341e8263bfab4b466f1b67e71acabaabbea6acf65896885c649ee1b007118f5c49976515a2a5d2df1209d010565c5813029a8c7b4e01a693a6afa47699d276c