From 3a6a32ae9471d55c9e8a3dfef1f175e5fb7473a85551dc370759071f9ddb37a4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Sep 2011 19:28:44 +0000 Subject: [PATCH 1/5] Accepting request 82811 from home:jengelh:bl-a2 - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/82811 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=16 --- autoconf-el.changes | 6 ++++++ autoconf-el.spec | 17 ++++------------- autoconf-testsuite.changes | 5 +++++ autoconf-testsuite.spec | 10 +++------- autoconf.changes | 5 +++++ autoconf.spec | 10 +++------- 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/autoconf-el.changes b/autoconf-el.changes index aebe700..88574c0 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Fri Dec 10 11:24:33 UTC 2010 - coolo@novell.com diff --git a/autoconf-el.spec b/autoconf-el.spec index 65b78e1..75f4347 100644 --- a/autoconf-el.spec +++ b/autoconf-el.spec @@ -1,7 +1,7 @@ # -# spec file for package autoconf-el (Version 2.67) +# spec file for package autoconf-el # -# 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 @@ -21,9 +21,8 @@ Name: autoconf-el BuildRequires: emacs-nox xz License: GPLv3+ Group: Productivity/Editors/Emacs -AutoReqProv: on Version: 2.68 -Release: 2 +Release: 1 Summary: Emacs mode for editing GNU Autoconf scripts Url: http://www.gnu.org/software/autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,18 +34,13 @@ Enhances: emacs %description Emacs mode for editing GNU Autoconf scripts -Authors: --------- - Martin Buchholz - Akim Demaille - %prep %setup -q -n autoconf-%{version} %build %{suse_update_config -f config} ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} -make -C lib/emacs +make -C lib/emacs %{?_smp_mflags} %install make -C lib/emacs install DESTDIR=$RPM_BUILD_ROOT @@ -66,9 +60,6 @@ sed 's/^;//' > $RPM_BUILD_ROOT%{site_lisp}/suse-start-%{name}.el <<\EOF ;;; %{site_lisp}/suse-start-%{name}.el ends here EOF -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %{site_lisp}/*.el diff --git a/autoconf-testsuite.changes b/autoconf-testsuite.changes index 9ea9ff2..45156c2 100644 --- a/autoconf-testsuite.changes +++ b/autoconf-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 17 13:42:01 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Jan 31 17:26:59 CET 2011 - pth@suse.de diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index f9da273..a55f548 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -1,7 +1,7 @@ # -# spec file for package autoconf (Version 2.68) +# spec file for package autoconf-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 @@ -22,11 +22,10 @@ BuildRequires: help2man xz License: GPLv3+ Group: Development/Tools/Building Url: http://www.gnu.org/software/autoconf -AutoReqProv: on Requires: m4 >= 1.4.6 PreReq: %{install_info_prereq} Version: 2.68 -Release: 2 +Release: 1 Summary: A GNU Tool for Automatically Configuring Source Code Source: autoconf-%{version}.tar.xz Patch0: autoreconf-ltdl.diff @@ -75,9 +74,6 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/*.el* %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz -%clean -rm -rf $RPM_BUILD_ROOT - %if "%{name}" == "autoconf" %files diff --git a/autoconf.changes b/autoconf.changes index 6c58635..f50b773 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 17 13:42:16 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Jan 31 17:26:28 CET 2011 - pth@suse.de diff --git a/autoconf.spec b/autoconf.spec index e23f99f..fc4baa9 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,7 +1,7 @@ # -# spec file for package autoconf (Version 2.68) +# spec file for package autoconf # -# 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 @@ -22,11 +22,10 @@ BuildRequires: help2man xz License: GPLv3+ Group: Development/Tools/Building Url: http://www.gnu.org/software/autoconf -AutoReqProv: on Requires: m4 >= 1.4.6 PreReq: %{install_info_prereq} Version: 2.68 -Release: 2 +Release: 1 Summary: A GNU Tool for Automatically Configuring Source Code Source: autoconf-%{version}.tar.xz Patch0: autoreconf-ltdl.diff @@ -75,9 +74,6 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/*.el* %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz -%clean -rm -rf $RPM_BUILD_ROOT - %if "%{name}" == "autoconf" %files From 2fdc0542973dceb33b36de5e0f271bac876f24567c4627259ddef3f78b309f07 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 19 Dec 2011 13:44:48 +0000 Subject: [PATCH 2/5] Accepting request 96953 from home:rudi_m:branches:devel:tools:building - correct license and style (prepare_spec) - minor build fixes, avoid deprecated macros to be more portable OBS-URL: https://build.opensuse.org/request/show/96953 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=17 --- autoconf.changes | 6 ++++++ autoconf.spec | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/autoconf.changes b/autoconf.changes index f50b773..0b9aff1 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 18 12:40:46 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:42:16 UTC 2011 - jengelh@medozas.de diff --git a/autoconf.spec b/autoconf.spec index fc4baa9..e975646 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -18,15 +18,16 @@ Name: autoconf -BuildRequires: help2man xz -License: GPLv3+ -Group: Development/Tools/Building +BuildRequires: help2man +BuildRequires: xz Url: http://www.gnu.org/software/autoconf Requires: m4 >= 1.4.6 -PreReq: %{install_info_prereq} +Requires(pre): info Version: 2.68 -Release: 1 +Release: 0 Summary: A GNU Tool for Automatically Configuring Source Code +License: GPL-3.0+ +Group: Development/Tools/Building Source: autoconf-%{version}.tar.xz Patch0: autoreconf-ltdl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,8 +65,10 @@ make check %else %install -make install DESTDIR=$RPM_BUILD_ROOT +%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} rm -f $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/*.el* +# info's dir file is not auto ignored on some systems +rm -rf %{buildroot}%{_infodir}/dir %endif %post From f2a7bd1466fb11ec594201e0a8c0b94fcc18d5ef8a13022564fb910a89b47cc3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 14:32:29 +0000 Subject: [PATCH 3/5] - correct license and style (prepare_spec) - minor build fixes, avoid deprecated macros to be more portable OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=18 --- autoconf-el.changes | 20 ++++++++++++++++++-- autoconf-el.spec | 12 +++++------- autoconf-testsuite.changes | 23 +++++++++++++++++------ autoconf-testsuite.spec | 20 ++++++++++---------- autoconf.changes | 10 ++++++++-- autoconf.spec | 5 +---- 6 files changed, 59 insertions(+), 31 deletions(-) diff --git a/autoconf-el.changes b/autoconf-el.changes index 88574c0..0d41b5b 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -1,9 +1,25 @@ +------------------------------------------------------------------- +Sun Dec 18 12:40:46 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:42:16 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build +------------------------------------------------------------------- +Mon Jan 31 17:26:28 CET 2011 - pth@suse.de + +- Cosmetic changes to spec file + ------------------------------------------------------------------- Fri Dec 10 11:24:33 UTC 2010 - coolo@novell.com @@ -485,12 +501,12 @@ Fri Jan 15 14:02:28 MET 1999 - ro@suse.de - update to 2.13 ----------------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jul 23 14:57:39 MET DST 1998 - werner@suse.de - Make auto*.sh more secure and use mktemp if avaliable ----------------------------------------------------------------------------- +------------------------------------------------------------------- Wed Jan 22 22:24:11 CET 1997 - florian@suse.de diff --git a/autoconf-el.spec b/autoconf-el.spec index 75f4347..ff31585 100644 --- a/autoconf-el.spec +++ b/autoconf-el.spec @@ -15,15 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: autoconf-el -BuildRequires: emacs-nox xz -License: GPLv3+ -Group: Productivity/Editors/Emacs +BuildRequires: emacs-nox +BuildRequires: xz Version: 2.68 -Release: 1 +Release: 0 Summary: Emacs mode for editing GNU Autoconf scripts +License: GPL-3.0+ +Group: Productivity/Editors/Emacs Url: http://www.gnu.org/software/autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: autoconf-%{version}.tar.xz @@ -38,7 +37,6 @@ Emacs mode for editing GNU Autoconf scripts %setup -q -n autoconf-%{version} %build -%{suse_update_config -f config} ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} make -C lib/emacs %{?_smp_mflags} diff --git a/autoconf-testsuite.changes b/autoconf-testsuite.changes index 45156c2..0d41b5b 100644 --- a/autoconf-testsuite.changes +++ b/autoconf-testsuite.changes @@ -1,13 +1,24 @@ ------------------------------------------------------------------- -Sat Sep 17 13:42:01 UTC 2011 - jengelh@medozas.de +Sun Dec 18 12:40:46 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:42:16 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile ------------------------------------------------------------------- -Mon Jan 31 17:26:59 CET 2011 - pth@suse.de +Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de -- Use 2.68 everywhere in specfile. -- Use %%configure macro in spec file. +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Mon Jan 31 17:26:28 CET 2011 - pth@suse.de + +- Cosmetic changes to spec file ------------------------------------------------------------------- Fri Dec 10 11:24:33 UTC 2010 - coolo@novell.com @@ -490,12 +501,12 @@ Fri Jan 15 14:02:28 MET 1999 - ro@suse.de - update to 2.13 ----------------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jul 23 14:57:39 MET DST 1998 - werner@suse.de - Make auto*.sh more secure and use mktemp if avaliable ----------------------------------------------------------------------------- +------------------------------------------------------------------- Wed Jan 22 22:24:11 CET 1997 - florian@suse.de diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index a55f548..135d7fd 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: autoconf-testsuite -BuildRequires: help2man xz -License: GPLv3+ -Group: Development/Tools/Building +BuildRequires: help2man +BuildRequires: xz Url: http://www.gnu.org/software/autoconf Requires: m4 >= 1.4.6 -PreReq: %{install_info_prereq} +Requires: info Version: 2.68 -Release: 1 +Release: 0 Summary: A GNU Tool for Automatically Configuring Source Code +License: GPL-3.0+ +Group: Development/Tools/Building Source: autoconf-%{version}.tar.xz Patch0: autoreconf-ltdl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,8 +49,7 @@ only required for the generation of the scripts, not their use. %patch0 %build -%{suse_update_config -f config} -%configure +./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} make %{?_smp_mflags} %if "%{name}" == "autoconf-testsuite" @@ -64,8 +62,10 @@ make check %else %install -make install DESTDIR=$RPM_BUILD_ROOT +%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} rm -f $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/*.el* +# info's dir file is not auto ignored on some systems +rm -rf %{buildroot}%{_infodir}/dir %endif %post diff --git a/autoconf.changes b/autoconf.changes index 0b9aff1..0d41b5b 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -9,6 +9,12 @@ Sat Sep 17 13:42:16 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile +------------------------------------------------------------------- +Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Mon Jan 31 17:26:28 CET 2011 - pth@suse.de @@ -495,12 +501,12 @@ Fri Jan 15 14:02:28 MET 1999 - ro@suse.de - update to 2.13 ----------------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jul 23 14:57:39 MET DST 1998 - werner@suse.de - Make auto*.sh more secure and use mktemp if avaliable ----------------------------------------------------------------------------- +------------------------------------------------------------------- Wed Jan 22 22:24:11 CET 1997 - florian@suse.de diff --git a/autoconf.spec b/autoconf.spec index e975646..6ae083e 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -15,14 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: autoconf BuildRequires: help2man BuildRequires: xz Url: http://www.gnu.org/software/autoconf Requires: m4 >= 1.4.6 -Requires(pre): info +Requires: info Version: 2.68 Release: 0 Summary: A GNU Tool for Automatically Configuring Source Code @@ -51,7 +49,6 @@ only required for the generation of the scripts, not their use. %patch0 %build -%{suse_update_config -f config} ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} make %{?_smp_mflags} From 182f517586bfbf093c282044e0381affeff0b0cd16ed33b81d585050f7a00aba Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 25 Dec 2011 16:42:55 +0000 Subject: [PATCH 4/5] - Use 2.68 everywhere in specfile. - Use %%configure macro in spec file. - Use 2.68 everywhere in specfile. - Use %%configure macro in spec file. - Use 2.68 everywhere in specfile. - Use %%configure macro in spec file. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=19 --- autoconf-el.changes | 6 ++++++ autoconf-el.spec | 1 + autoconf-testsuite.changes | 6 ++++++ autoconf-testsuite.spec | 1 + autoconf.changes | 6 ++++++ autoconf.spec | 1 + 6 files changed, 21 insertions(+) diff --git a/autoconf-el.changes b/autoconf-el.changes index 0d41b5b..2ee7dcf 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -15,6 +15,12 @@ Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build +------------------------------------------------------------------- +Mon Jan 31 17:26:59 CET 2011 - pth@suse.de + +- Use 2.68 everywhere in specfile. +- Use %%configure macro in spec file. + ------------------------------------------------------------------- Mon Jan 31 17:26:28 CET 2011 - pth@suse.de diff --git a/autoconf-el.spec b/autoconf-el.spec index ff31585..0b90294 100644 --- a/autoconf-el.spec +++ b/autoconf-el.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: autoconf-el BuildRequires: emacs-nox BuildRequires: xz diff --git a/autoconf-testsuite.changes b/autoconf-testsuite.changes index 0d41b5b..2ee7dcf 100644 --- a/autoconf-testsuite.changes +++ b/autoconf-testsuite.changes @@ -15,6 +15,12 @@ Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build +------------------------------------------------------------------- +Mon Jan 31 17:26:59 CET 2011 - pth@suse.de + +- Use 2.68 everywhere in specfile. +- Use %%configure macro in spec file. + ------------------------------------------------------------------- Mon Jan 31 17:26:28 CET 2011 - pth@suse.de diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index 135d7fd..0ad877e 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: autoconf-testsuite BuildRequires: help2man BuildRequires: xz diff --git a/autoconf.changes b/autoconf.changes index 0d41b5b..2ee7dcf 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -15,6 +15,12 @@ Sat Sep 17 13:41:38 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build +------------------------------------------------------------------- +Mon Jan 31 17:26:59 CET 2011 - pth@suse.de + +- Use 2.68 everywhere in specfile. +- Use %%configure macro in spec file. + ------------------------------------------------------------------- Mon Jan 31 17:26:28 CET 2011 - pth@suse.de diff --git a/autoconf.spec b/autoconf.spec index 6ae083e..550ebf8 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: autoconf BuildRequires: help2man BuildRequires: xz From 502045de9192e934ed21feaddeec62d6c7171e92228d374d93e713e6a5238e5c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 26 Dec 2011 15:40:01 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=20 --- autoconf-testsuite.spec | 2 +- autoconf.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index 0ad877e..1b42eed 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -50,7 +50,7 @@ only required for the generation of the scripts, not their use. %patch0 %build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +%configure make %{?_smp_mflags} %if "%{name}" == "autoconf-testsuite" diff --git a/autoconf.spec b/autoconf.spec index 550ebf8..d7ff357 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -50,7 +50,7 @@ only required for the generation of the scripts, not their use. %patch0 %build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +%configure make %{?_smp_mflags} %if "%{name}" == "autoconf-testsuite"