From fb9db906c84c4951efd2934e529620ff519eb54d047f7336d528853cefaa2769 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 9 Jul 2020 15:06:34 +0000 Subject: [PATCH] Accepting request 818872 from home:gmbr3:Active - Changed automake-SuSE.patch: updated for new version - Update to 1.16.2. Changes since 1.16.1: * New features added - add zstd support and the automake option, dist-zstd. - support for Python 3: py-compile now supports both Python 3 and Python 2; tests do not require .pyo files, and uninstall deletes __pycache__ correctly (automake bug #32088). * Miscellaneous changes - automake no longer requires a @setfilename in each .texi file * Bugs fixed - 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 considers '\n' as the 'n' character instead of a newline. (automake bug#31222) - For make tags, lisp_LISP is followed by the necessary space when used with CONFIG_HEADERS. (automake bug#38139) - The automake test txinfo-vtexi4.sh no longer fails when localtime and UTC cross a day boundary. - Emacsen older than version 25, which require use of byte-compile-dest-file, are supported again. OBS-URL: https://build.opensuse.org/request/show/818872 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=79 --- automake-1.16.1.tar.xz | 3 -- automake-1.16.1.tar.xz.sig | 16 --------- automake-1.16.2.tar.xz | 3 ++ automake-1.16.2.tar.xz.sig | 16 +++++++++ automake-SuSE.patch | 73 +++++++++++++++++++++----------------- automake.changes | 35 ++++++++++++++++++ automake.spec | 2 +- 7 files changed, 96 insertions(+), 52 deletions(-) delete mode 100644 automake-1.16.1.tar.xz delete mode 100644 automake-1.16.1.tar.xz.sig create mode 100644 automake-1.16.2.tar.xz create mode 100644 automake-1.16.2.tar.xz.sig diff --git a/automake-1.16.1.tar.xz b/automake-1.16.1.tar.xz deleted file mode 100644 index 249f409..0000000 --- a/automake-1.16.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921 -size 1534936 diff --git a/automake-1.16.1.tar.xz.sig b/automake-1.16.1.tar.xz.sig deleted file mode 100644 index 18d4270..0000000 --- a/automake-1.16.1.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8qONfusrZkBXYQcNCt7hAJRgTTcFAlqlqd8ACgkQCt7hAJRg -TTfmxBAAgkCe+cqMbt1PbBByiVk0yQ59DWD7We3rzaFXM2/qnhw/LkDOSPoec/Hf -BGywRg+PEtuRa+GGjqLjFudR4eE2hu1J4NkBvLQz0FVQWYTDlPz/ril3w3hKsPr5 -jnjkjDTpHmgtodG7v68Pz9gyJ3aFidcI2JdoNRC/nbJLCE8xnWCfd3qGd6hZTGsQ -yj0hPpqCBwlaZxgAWbAk8OdlfyQDVHXuPF9aY/LzlNfQsYvoLlOjp8Fdq0IHxSSj -LesRITZn0RfnXaaUXzkldUg36DNy+zFdej00oO+Oh+qunu3dnkUdpRXSiCRbW64s -xzFN4xYRfVNytQZ4GQsBnIcscKRq2ilJ/9vM42DnSyb9MlsJSFz8/s3TEMFjgkjO -UTg+pTLFfNfpmWRGjMScl638lTvFo7+PHlCvb2kIBpffL7dUED7KM0tDZqZA1M2c -cYM7V6P9EnaUdpTIqNznWlOL+wT4pkn6aamUzUDfHe/XTDUNCk4Q3ENrsmT5RDkN -vAx31GrUXy2njHFvJQ+7Uy9qkj+IuWN1Zv67+CAaam3pkVhV+qwmbkzRp9J+7pvu -g1r1RwsxfhtHwdzf1JAbElsfhYx0iTe3EHSaIxWuOQQ9aXjFIVghdPfj9sbPf+0t -PORmWeFlw3a2Esk7NzUfnM1UDc3o4ObRlSssATNEwOxnl3IATkI= -=bqhV ------END PGP SIGNATURE----- diff --git a/automake-1.16.2.tar.xz b/automake-1.16.2.tar.xz new file mode 100644 index 0000000..1576e73 --- /dev/null +++ b/automake-1.16.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 +size 1545912 diff --git a/automake-1.16.2.tar.xz.sig b/automake-1.16.2.tar.xz.sig new file mode 100644 index 0000000..af0d8b9 --- /dev/null +++ b/automake-1.16.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAl52mAoACgkQf9n8ywAL +7u7kdw//S3/YlrDVGYgBBj8gyDisiuAQPthoz9fXoGyjutqxxnU+o5lV6lrzI+Ti +wEfM4ZBaN/vXkc/YMpxnNMw4fRYcH4/mz2YTaJZzOHZEOdF4V6Vb3PdxH7O3AUS2 +krwfWicsZ+bAOwG1vawWwBawIH8w2mmA/NP7WP4r4NcgCuaDg7iQv/2aknvrVXN2 +u1Z5DQZ8iXo/S7Q8NH3GJIswnD6Jn0VQf3z9yFxXVOZ5Y/NMjDKxVtBaurMTpMcj +50JDmy6iiK9rY1ngLszvBxvkRR3g5q2K/VKuJmWteLCCdFLBSA05h/5vmPX+TUOt +15G9bm2n0IAsZn9YudvEBIydnZmJf5zRaZsmpNDdCQgsB/SIdV9y6F536jA1Mdxs +VJ1iB8sQlCkdl/GWAz3ZkYmIuIODEYVWbBaQJ65BUL5Ofmxak2ymV82g0cD2GQo9 +VlvUhLZWAGWYtZjDq+4geHpSdrfkJheYJdUbQ6pMNjghXsNluXs/4PxydPobK8WG +F+MEpKDMuUvIVdW++y22pz/MGqVWpTjMdUsBEr4FT/4jSMw+H7zDgC3xs/XPUx5L +Bu6UFWBqY/RyR4JpqbecCe9zlwb+zul67nWowOvD0S2IqoI6B1L1mnxg/BYCJf59 +2gGY3db5CO41K/qogsuVQm/JBH8E7ZLBAmGqBpbe2a6UZkOr5ds= +=OgSk +-----END PGP SIGNATURE----- diff --git a/automake-SuSE.patch b/automake-SuSE.patch index 941f8f8..63c9ef6 100644 --- a/automake-SuSE.patch +++ b/automake-SuSE.patch @@ -36,53 +36,62 @@ Index: lib/config.guess esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. -@@ -241,36 +251,36 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM - exit ;; +@@ -245,42 +245,42 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM + exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE" - exit ;; + exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE" - exit ;; + exit ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE" - exit ;; + exit ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE" - exit ;; + exit ;; + *:OS108:*:*) +- echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" ++ echo "$UNAME_MACHINE"-${VENDOR}-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE" - exit ;; + exit ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix + echo "$UNAME_MACHINE"-${VENDOR}-sortix - exit ;; + exit ;; + *:Twizzler:*:*) +- echo "$UNAME_MACHINE"-unknown-twizzler ++ echo "$UNAME_MACHINE"-${VENDOR}-twizzler + exit ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox + echo "$UNAME_MACHINE"-${VENDOR}-redox - exit ;; + exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 + echo mips-dec-osf1 + @@ -332,13 +342,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM trap '' 0 exit $exitcode ;; @@ -493,24 +502,24 @@ Index: lib/config.sub =================================================================== --- lib/config.sub.orig 2018-03-21 12:19:25.009766883 +0100 +++ lib/config.sub 2018-03-21 12:19:27.861785205 +0100 -@@ -1071,12 +1071,18 @@ case $basic_machine in - rtpc | rtpc-*) - basic_machine=romp-ibm +@@ -1138,13 +1138,19 @@ + cpu=nsx + vendor=tandem ;; -- s390 | s390-*) + s390) - basic_machine=s390-ibm - ;; -- s390x | s390x-*) -+ s390-*) -+ basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` ++ cpu=s390 ++ vendor=ibm ++ ;; + s390-*) + cpu=s390 + ;; + s390x) - basic_machine=s390x-ibm ++ cpu=s390x + vendor=ibm ;; -+ s390x-*) -+ basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi + s390x-*) + cpu=s390x +- vendor=ibm + ;; + tile*-*) + os=${os:-linux-gnu} diff --git a/automake.changes b/automake.changes index fd82df1..ae0d419 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sun Jul 5 16:19:34 UTC 2020 - Callum Farmer + +- Changed automake-SuSE.patch: updated for new version +- Update to 1.16.2. Changes since 1.16.1: + * New features added + + - add zstd support and the automake option, dist-zstd. + + - support for Python 3: py-compile now supports both Python 3 + and Python 2; tests do not require .pyo files, and uninstall + deletes __pycache__ correctly (automake bug #32088). + + * Miscellaneous changes + + - automake no longer requires a @setfilename in each .texi file + + * Bugs fixed + + - 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 + considers '\n' as the 'n' character instead of a newline. + (automake bug#31222) + + - For make tags, lisp_LISP is followed by the necessary space when + used with CONFIG_HEADERS. + (automake bug#38139) + + - The automake test txinfo-vtexi4.sh no longer fails when localtime + and UTC cross a day boundary. + + - Emacsen older than version 25, which require use of + byte-compile-dest-file, are supported again. + ------------------------------------------------------------------- Sun Mar 22 14:00:34 UTC 2020 - Andreas Stieger diff --git a/automake.spec b/automake.spec index bfd7557..7926a1f 100644 --- a/automake.spec +++ b/automake.spec @@ -20,7 +20,7 @@ %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: Name: automake -Version: 1.16.1 +Version: 1.16.2 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT