diff --git a/automake-testsuite.changes b/automake-testsuite.changes index caa0a49..a31f4dd 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -77,6 +77,9 @@ Wed Mar 21 11:26:53 CET 2018 - pth@suse.de that Emacs-26 will continue to support the old function, but will complain loudly, and that Emacs-27 will remove support for it altogether. +- Build serially as a missing dependency makes parallel builds fail. +- Update the list of licenses. + ------------------------------------------------------------------- Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 4c8b06a..e83c192 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -24,13 +24,16 @@ Name: automake-testsuite Version: 1.16.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files -License: GPL-2.0+ +# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT +License: GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Building Url: https://www.gnu.org/software/automake Source0: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=automake&download=1#/automake.keyring Source3: automake-rpmlintrc +#Source4: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +#Source5: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch @@ -41,6 +44,7 @@ BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: xz BuildRequires: perl(Thread::Queue) +BuildRequires: perl(threads) Requires: autoconf >= 2.69 Requires: info Requires(post): info @@ -55,6 +59,10 @@ Requires: flex Requires: libtool %endif +# remove bogus Automake perl dependencies and provides +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: + %description Automake is a tool for automatically generating "Makefile.in" files from "Makefile.am" files. "Makefile.am" is a series of "make" macro @@ -71,7 +79,7 @@ definitions (with rules occasionally thrown in). The generated %build sh bootstrap %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags} +make #%%{?_smp_mflags} %if "%{name}" == "automake-testsuite" %check diff --git a/automake.changes b/automake.changes index caa0a49..a31f4dd 100644 --- a/automake.changes +++ b/automake.changes @@ -77,6 +77,9 @@ Wed Mar 21 11:26:53 CET 2018 - pth@suse.de that Emacs-26 will continue to support the old function, but will complain loudly, and that Emacs-27 will remove support for it altogether. +- Build serially as a missing dependency makes parallel builds fail. +- Update the list of licenses. + ------------------------------------------------------------------- Sun Feb 4 23:06:25 UTC 2018 - mail@bernhard-voelker.de diff --git a/automake.spec b/automake.spec index 54fb30c..c241b80 100644 --- a/automake.spec +++ b/automake.spec @@ -24,13 +24,16 @@ Name: automake Version: 1.16.1 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files -License: GPL-2.0+ +# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT +License: GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Building Url: https://www.gnu.org/software/automake Source0: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=automake&download=1#/automake.keyring Source3: automake-rpmlintrc +#Source4: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +#Source5: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess Patch2: automake-require_file.patch Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch @@ -41,6 +44,7 @@ BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: xz BuildRequires: perl(Thread::Queue) +BuildRequires: perl(threads) Requires: autoconf >= 2.69 Requires: info Requires(post): info @@ -55,6 +59,10 @@ Requires: flex Requires: libtool %endif +# remove bogus Automake perl dependencies and provides +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: + %description Automake is a tool for automatically generating "Makefile.in" files from "Makefile.am" files. "Makefile.am" is a series of "make" macro @@ -71,7 +79,7 @@ definitions (with rules occasionally thrown in). The generated %build sh bootstrap %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags} +make #%%{?_smp_mflags} %if "%{name}" == "automake-testsuite" %check