From f9f4942a7b306cbda93979d60f33447d772490ba7ac6d16c7858a333484c3b64 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Dec 2011 08:59:17 +0000 Subject: [PATCH] Accepting request 97374 from devel:tools:building add autoconf to buildrequires (forwarded request 97318 from coolo) OBS-URL: https://build.opensuse.org/request/show/97374 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=24 --- automake-testsuite.changes | 11 +++++++++++ automake-testsuite.spec | 37 ++++++++++++++----------------------- automake.changes | 16 ++++++++++++++++ automake.spec | 37 ++++++++++++++----------------------- 4 files changed, 55 insertions(+), 46 deletions(-) diff --git a/automake-testsuite.changes b/automake-testsuite.changes index 08c9f70..d4515a7 100644 --- a/automake-testsuite.changes +++ b/automake-testsuite.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 18 12:39:06 UTC 2011 - sweet_f_a@gmx.de + +- correct license and style (prepare_spec) +- minor build fixes, avoid deprecated macros to be more portable + +------------------------------------------------------------------- +Sat Sep 17 13:44:54 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/automake-testsuite.spec b/automake-testsuite.spec index 5c38c9b..64e73f9 100644 --- a/automake-testsuite.spec +++ b/automake-testsuite.spec @@ -1,7 +1,7 @@ # -# spec file for package automake-testsuite (Version 1.11.1) +# spec file for package automake-testsuite # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: automake-testsuite -BuildRequires: bison help2man -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -PreReq: %{install_info_prereq} +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: help2man +Requires: info Requires: autoconf >= 2.62 Version: 1.11.1 -Release: 6 +Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files +License: GPL-2.0+ +Group: Development/Tools/Building Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.bz2 @@ -42,15 +41,6 @@ from "Makefile.am" files. "Makefile.am" is a series of "make" macro definitions (with rules occasionally thrown in). The generated "Makefile.in" files are compatible with the GNU Makefile standards. - - -Authors: --------- - David Mackenzie - Tom Tromey - Alexandre Oliva - Alexandre Duret-Lutz - %prep %setup -q -n automake-%{version} %patch1 @@ -58,7 +48,8 @@ Authors: %build %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags}; +make %{?_smp_mflags} + %if "%{name}" == "automake-testsuite" %check @@ -71,7 +62,7 @@ make check VERBOSE=1 %else %install -%makeinstall +make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist @@ -79,6 +70,8 @@ mkdir -p %{buildroot}%{_mandir}/man1 perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1 perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} +# info's dir file is not auto ignored on some systems +rm -rf %{buildroot}%{_infodir}/dir #name == automake %endif @@ -88,8 +81,6 @@ install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz -%clean -rm -rf %{buildroot} %if "%{name}" == "automake" %files diff --git a/automake.changes b/automake.changes index 08c9f70..54a174d 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Dec 20 19:58:14 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Sun Dec 18 12:39:06 UTC 2011 - sweet_f_a@gmx.de + +- correct license and style (prepare_spec) +- minor build fixes, avoid deprecated macros to be more portable + +------------------------------------------------------------------- +Sat Sep 17 13:44:54 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de diff --git a/automake.spec b/automake.spec index 38756a9..7296de4 100644 --- a/automake.spec +++ b/automake.spec @@ -1,7 +1,7 @@ # -# spec file for package automake (Version 1.11.1) +# spec file for package automake # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: automake -BuildRequires: bison help2man -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -PreReq: %{install_info_prereq} +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: help2man +Requires: info Requires: autoconf >= 2.62 Version: 1.11.1 -Release: 6 +Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files +License: GPL-2.0+ +Group: Development/Tools/Building Url: http://www.gnu.org/software/automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: automake-%{version}.tar.bz2 @@ -42,15 +41,6 @@ from "Makefile.am" files. "Makefile.am" is a series of "make" macro definitions (with rules occasionally thrown in). The generated "Makefile.in" files are compatible with the GNU Makefile standards. - - -Authors: --------- - David Mackenzie - Tom Tromey - Alexandre Oliva - Alexandre Duret-Lutz - %prep %setup -q -n automake-%{version} %patch1 @@ -58,7 +48,8 @@ Authors: %build %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags}; +make %{?_smp_mflags} + %if "%{name}" == "automake-testsuite" %check @@ -71,7 +62,7 @@ make check VERBOSE=1 %else %install -%makeinstall +make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/etc %{buildroot}/usr/share/aclocal echo /usr/local/share/aclocal >%{buildroot}/etc/aclocal_dirlist ln -s ../../../etc/aclocal_dirlist %{buildroot}/usr/share/aclocal/dirlist @@ -79,6 +70,8 @@ mkdir -p %{buildroot}%{_mandir}/man1 perllibdir=lib help2man -S FSF ./aclocal > %{buildroot}%{_mandir}/man1/aclocal.1 perllibdir=lib help2man -S FSF ./automake > %{buildroot}%{_mandir}/man1/automake.1 install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir}/%{name} +# info's dir file is not auto ignored on some systems +rm -rf %{buildroot}%{_infodir}/dir #name == automake %endif @@ -88,8 +81,6 @@ install -m644 AUTHORS COPYING ChangeLog NEWS README THANKS %{buildroot}%{_docdir %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz -%clean -rm -rf %{buildroot} %if "%{name}" == "automake" %files