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 259d3e3f1b9ba82ea655c9f14b36659a6c4386e3..74150b2dd4ef82560c4d54e9f7af5280c0356987 100644 --- a/automake.spec +++ b/automake.spec @@ -3,8 +3,8 @@ %global __provides_exclude ^perl\\(Automake:: Name: automake -Version: 1.16.2 -Release: 3 +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,9 +12,6 @@ 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 - BuildArch: noarch #disable am-prog-cc-c-o ccnoco ccnoco-lib test @@ -43,6 +40,7 @@ with the GNU Coding Standards. Automake requires the use of Autoconf. autoreconf -iv cp %{SOURCE1} ./lib/config.sub cp %{SOURCE2} ./lib/config.guess +./bootstrap %configure %make_build @@ -76,6 +74,12 @@ fi %{_mandir}/man1/* %changelog +* Tue Dec 21 2021 wangjie - 1.16.5-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:Update automake to 1.16.5 + * Fri Jul 30 2021 panxiaohe - 1.16.2-3 - Support -fno-common in vala-mix2 test 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 -