diff --git a/0001-disable-three-tests.patch b/0001-disable-three-tests.patch deleted file mode 100644 index c739a50df3e22935cfca4fd3083cfbdd4e467084..0000000000000000000000000000000000000000 --- a/0001-disable-three-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d41640c27738014ebc075a2fc763fc998c041be Mon Sep 17 00:00:00 2001 -From: shenyangyang4 -Date: Sat, 12 Oct 2019 08:16:42 -0400 -Subject: [PATCH] disable-three-tests - ---- - t/list-of-tests.mk | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk -index 84dd29a..37f2041 100644 ---- a/t/list-of-tests.mk -+++ b/t/list-of-tests.mk -@@ -138,7 +138,6 @@ t/aminit-trailing-dnl-comment-pr16841.sh \ - t/amassign.sh \ - t/am-config-header.sh \ - t/am-prog-cc-stdc.sh \ --t/am-prog-cc-c-o.sh \ - t/am-macro-not-found.sh \ - t/amopt.sh \ - t/amopts-location.sh \ -@@ -215,8 +214,6 @@ t/canon6.sh \ - t/canon7.sh \ - t/canon8.sh \ - t/canon-name.sh \ --t/ccnoco.sh \ --t/ccnoco-lib.sh \ - t/ccnoco-lt.sh \ - t/ccnoco3.sh \ - t/ccnoco4.sh \ --- -2.19.1 - diff --git a/automake-1.16.2.tar.xz b/automake-1.16.2.tar.xz deleted file mode 100644 index 1b9144b0e4bd4ae60df563f87efadd3726142dc4..0000000000000000000000000000000000000000 Binary files a/automake-1.16.2.tar.xz and /dev/null differ diff --git a/automake-1.16.5.tar.xz b/automake-1.16.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ff2c5401387dcca75227036abb00a262a4024e34 Binary files /dev/null and b/automake-1.16.5.tar.xz differ diff --git a/automake.spec b/automake.spec index aba6176258ac0214372702cf7ce53196b8d76829..6b99340bca61e72534dff1706fb330df081f664e 100644 --- a/automake.spec +++ b/automake.spec @@ -3,8 +3,8 @@ %global __provides_exclude ^perl\\(Automake:: Name: automake -Version: 1.16.2 -Release: 4 +Version: 1.16.5 +Release: 1 Summary: A tool for automatically generating Makefile.in files License: GPLv2+ and GFDL and Public Domain and MIT URL: http://www.gnu.org/software/automake/ @@ -12,15 +12,10 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source1: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub Source2: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -Patch1: tests-require-etags-for-tags-lisp-space-test.patch -Patch2: tests-support-fno-common-in-vala-mix2-test.patch -Patch3: backport-python-determine-Python-3.10-version-number-correctl.patch - BuildArch: noarch #disable am-prog-cc-c-o ccnoco ccnoco-lib test #that success through rpmbuild but fail on obs -Patch0: 0001-disable-three-tests.patch BuildRequires: perl autoconf make help2man automake perl-generators texinfo #for tests @@ -77,6 +72,9 @@ fi %{_mandir}/man1/* %changelog +* Tue Feb 15 2022 zoulin - 1.16.5-1 +- update version to 1.16.5 + * Tue Dec 28 2021 renhongxun - 1.16.2-4 - bugfix about python 3.10 diff --git a/backport-python-determine-Python-3.10-version-number-correctl.patch b/backport-python-determine-Python-3.10-version-number-correctl.patch deleted file mode 100644 index e0d6dc05d8c70f296494ff1bc71a5c66e7454448..0000000000000000000000000000000000000000 --- a/backport-python-determine-Python-3.10-version-number-correctl.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e21d46fddd0753e66a4acda88317670fee07f3e6 Mon Sep 17 00:00:00 2001 -From: "Miro Hron\\v{c}ok" -Date: Tue, 27 Oct 2020 14:33:46 -0700 -Subject: [PATCH] python: determine Python (3.10) version number correctly. - -This change fixes https://bugs.gnu.org/44239 -(and https://bugzilla.redhat.com/show_bug.cgi?id=1889732). - -* m4/python.m4: use print('%u.%u' % sys.version_info[:2]) for -the version number instead of merely sys.version[:3], so the -numbers are treated as numbers. -* t/python-vars.sh (PYTHON_VERSION): Likewise. -* doc/automake.texi: Document it. -* NEWS: mention it. (Minor tweaks from Karl Berry.) ---- - NEWS | 2 ++ - doc/automake.texi | 2 +- - m4/python.m4 | 12 +++++++----- - t/python-vars.sh | 4 +++- - 4 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/NEWS b/NEWS -index fa35bf1..9c69e48 100644 ---- a/NEWS -+++ b/NEWS -@@ -74,6 +74,8 @@ New in 1.16.2: - - * Bugs fixed - -+ - Python 3.10 version number no longer considered to be 3.1. -+ - - When cleaning the compiled python files, '\n' is not used anymore in the - substitution text of 'sed' transformations. This is done to preserve - compatibility with the 'sed' implementation provided by macOS which -diff --git a/doc/automake.texi b/doc/automake.texi -index ed7e2e2..17bc2da 100644 ---- a/doc/automake.texi -+++ b/doc/automake.texi -@@ -7861,7 +7861,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) - @item PYTHON_VERSION - The Python version number, in the form @var{major}.@var{minor} - (e.g., @samp{2.5}). This is currently the value of --@samp{sys.version[:3]}. -+@samp{'%u.%u' % sys.version_info[:2]}. - - @item PYTHON_PREFIX - The string @samp{$@{prefix@}}. This term may be used in future work -diff --git a/m4/python.m4 b/m4/python.m4 -index 16c2f4f..b2302ba 100644 ---- a/m4/python.m4 -+++ b/m4/python.m4 -@@ -1,7 +1,7 @@ - ## ------------------------ -*- Autoconf -*- - ## Python file handling - ## From Andrew Dalke --## Updated by James Henstridge -+## Updated by James Henstridge and other contributors. - ## ------------------------ - # Copyright (C) 1999-2020 Free Software Foundation, Inc. - # -@@ -86,12 +86,14 @@ AC_DEFUN([AM_PATH_PYTHON], - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) - else - -- dnl Query Python for its version number. Getting [:3] seems to be -- dnl the best way to do this; it's what "site.py" does in the standard -- dnl library. -+ dnl Query Python for its version number. Although site.py simply uses -+ dnl sys.version[:3], printing that failed with Python 3.10, since the -+ dnl trailing zero was eliminated. So now we output just the major -+ dnl and minor version numbers, as numbers. Apparently the tertiary -+ dnl version is not of interest. - - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], -- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) -+ [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - - dnl Use the values of $prefix and $exec_prefix for the corresponding -diff --git a/t/python-vars.sh b/t/python-vars.sh -index 5c748bc..b53018b 100644 ---- a/t/python-vars.sh -+++ b/t/python-vars.sh -@@ -28,7 +28,9 @@ CONFIG_SITE=/dev/null; export CONFIG_SITE - # vary among different python installations, so we need more relaxed - # and ad-hoc checks for them. Also, more proper "functional" checks - # on them should be done in the 'python-virtualenv.sh' test. --PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || exit 1 -+# -+# This version identification is duplicated in python.m4 (and the manual). -+PYTHON_VERSION=$($PYTHON -c 'import sys; print("%u.%u" % sys.version_info[:2])') || exit 1 - PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1 - PYTHON_EXEC_PREFIX='${exec_prefix}' - PYTHON_PREFIX='${prefix}' --- -1.8.3.1 - diff --git a/config.guess b/config.guess index 256083a70d35921d544b15f4f51749af89d18b89..8af5abb8e19cb5718ddca8767bf0ffb768a3cf23 100644 --- a/config.guess +++ b/config.guess @@ -964,6 +964,9 @@ EOF k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch64:Linux:*:* | loongarch32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; diff --git a/config.sub b/config.sub index 20f7cf29a9ed34f61ad235a26d67c09a9a6a523d..f1773ed4fef540aaca05b6fd3c562fb6496c5539 100644 --- a/config.sub +++ b/config.sub @@ -285,6 +285,7 @@ case $basic_machine in | k1om \ | le32 | le64 \ | lm32 \ + | loongarch64 | loongarch32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ @@ -415,6 +416,7 @@ case $basic_machine in | k1om-* \ | le32-* | le64-* \ | lm32-* \ + | loongarch64 | loongarch32 \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ diff --git a/tests-require-etags-for-tags-lisp-space-test.patch b/tests-require-etags-for-tags-lisp-space-test.patch deleted file mode 100644 index 70ca8f783c3eb377eaf31bbe78aba0da774b98ad..0000000000000000000000000000000000000000 --- a/tests-require-etags-for-tags-lisp-space-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 77d39959511295f5a30332d5d03f0a6956bd9460 Mon Sep 17 00:00:00 2001 -From: Karl Berry -Date: Tue, 24 Mar 2020 18:30:18 -0700 -Subject: [PATCH] tests: require etags for tags-lisp-space test. - -* t/tags-lisp-space.sh (required): set to etags. ---- - t/tags-lisp-space.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/tags-lisp-space.sh b/t/tags-lisp-space.sh -index d0a940ba3..44312b0b7 100755 ---- a/t/tags-lisp-space.sh -+++ b/t/tags-lisp-space.sh -@@ -18,7 +18,7 @@ - # if there are CONFIG_HEADERS. - # See automake bug#38139. - --required='' -+required=etags - . test-init.sh - - # some AC_CONFIG_FILES header is needed to trigger the bug. diff --git a/tests-support-fno-common-in-vala-mix2-test.patch b/tests-support-fno-common-in-vala-mix2-test.patch deleted file mode 100644 index cff07eec122271498fa6920e7fd64d88aef843d9..0000000000000000000000000000000000000000 --- a/tests-support-fno-common-in-vala-mix2-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 74b9f0bbad27ae1b6ecfca7fb072cbad85a98a6b Mon Sep 17 00:00:00 2001 -From: Karl Berry -Date: Sat, 6 Jun 2020 15:47:33 -0700 -Subject: [PATCH] tests: support -fno-common in vala-mix2 test. - -This change fixes https://bugs.gnu.org/41726. - -* t/vala-mix2.sh: extern in .h, initialization in .c. -GCC 10 defaults to -fno-common. ---- - t/vala-mix2.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh -index 8e6a214..933a3ff 100644 ---- a/t/vala-mix2.sh -+++ b/t/vala-mix2.sh -@@ -44,7 +44,7 @@ int main () - END - - cat > foo.h <<'END' --int foo; -+extern int foo; - int bar (void); - int baz (void); - END -@@ -56,7 +56,7 @@ END - - cat > baz.c <<'END' - #include "foo.h" --extern int foo = 0; -+int foo = 0; - int baz (void) { return 0; } - END - --- -1.8.3.1 -