From 8611ec5c34309555d9addf78217397eeec72884a83f7fe14bdbafd71d7ee507b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:25:40 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/libservicelog revision 13.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=41febff5798822aadbefa88d40b6b708 --- libservicelog.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libservicelog.spec b/libservicelog.spec index bbe32cf..4374508 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -24,7 +24,7 @@ Summary: Servicelog Database and Library Requires: libservicelog-library BuildRequires: sqlite3-devel librtas-devel pkg-config Group: System/Libraries -License: LGPLv2.0+ +License: LGPL-2.0+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://linux-diag.sourceforge.net/servicelog/ ExclusiveArch: ppc ppc64 @@ -50,7 +50,7 @@ Authors: Nathan Fontenot %package -n libservicelog-1_1-1 -License: LGPLv2.0+ +License: LGPL-2.0+ Summary: Servicelog Database and Library Group: System/Libraries Provides: libservicelog-library @@ -70,7 +70,7 @@ Authors: Nathan Fontenot %package devel -License: LGPLv2.0+ +License: LGPL-2.0+ Summary: Development files for libservicelog Group: Development/Libraries/Other Requires: %{name} = %{version} glibc-devel From 063f91fb0a3c34dcce8dfa21a4db43570d82e0dd6c59fc07fcfc4e132631b7f9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 31 Jan 2012 10:41:37 +0000 Subject: [PATCH 2/3] Remove redundant tags/sections; %_smp_mflags OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=12 --- libservicelog.changes | 6 ++++++ libservicelog.spec | 47 ++++++++++--------------------------------- 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/libservicelog.changes b/libservicelog.changes index 009e8b8..aa0df91 100644 --- a/libservicelog.changes +++ b/libservicelog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 31 10:41:31 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + ------------------------------------------------------------------- Wed Nov 2 12:31:42 UTC 2011 - dvaleev@suse.com diff --git a/libservicelog.spec b/libservicelog.spec index 4374508..5cc44d1 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -1,7 +1,7 @@ # -# spec file for package libservicelog (Version 1.0.1) +# spec file for package libservicelog # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libservicelog Version: 1.1.11 -Release: 1 +Release: 0 Summary: Servicelog Database and Library -Requires: libservicelog-library -BuildRequires: sqlite3-devel librtas-devel pkg-config -Group: System/Libraries License: LGPL-2.0+ +Group: System/Libraries +Requires: libservicelog-library +BuildRequires: librtas-devel +BuildRequires: pkg-config +BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://linux-diag.sourceforge.net/servicelog/ -ExclusiveArch: ppc ppc64 +ExclusiveArch: ppc ppc64 Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Source2: libservicelog-rpmlintrc @@ -42,15 +42,7 @@ allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. - - -Authors: --------- - Mike Strosaker - Nathan Fontenot - %package -n libservicelog-1_1-1 -License: LGPL-2.0+ Summary: Servicelog Database and Library Group: System/Libraries Provides: libservicelog-library @@ -62,30 +54,15 @@ allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. - - -Authors: --------- - Mike Strosaker - Nathan Fontenot - %package devel -License: LGPL-2.0+ Summary: Development files for libservicelog Group: Development/Libraries/Other Requires: %{name} = %{version} glibc-devel -Requires: libservicelog-1_1-1 +Requires: libservicelog-1_1-1 %description devel Contains header files for building with libservicelog. - - -Authors: --------- - Mike Strosaker - Nathan Fontenot - %prep %setup -q %patch0 @@ -96,14 +73,12 @@ Authors: autoreconf -fiv export CFLAGS="%{optflags}" %configure --with-pic --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %{makeinstall} %__rm -f %{buildroot}%{_libdir}/*.la -%clean - %pre /usr/sbin/groupadd -r service || echo groupadd service failed From d2b4e6fc81ecdac3c44ff30deff5cb714fbc904a70971040c33619aa9dfdc6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 31 Jan 2012 15:12:00 +0000 Subject: [PATCH 3/3] Accepting request 102268 from home:msmeissn:branches:devel:libraries:c_c++ fix build OBS-URL: https://build.opensuse.org/request/show/102268 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=13 --- libservicelog.changes | 5 +++++ libservicelog.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libservicelog.changes b/libservicelog.changes index aa0df91..088f59c 100644 --- a/libservicelog.changes +++ b/libservicelog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 31 16:01:42 CET 2012 - meissner@suse.de + +- buildreq autoconf and libtool so autoreconf -ivf works again. + ------------------------------------------------------------------- Tue Jan 31 10:41:31 UTC 2012 - jengelh@medozas.de diff --git a/libservicelog.spec b/libservicelog.spec index 5cc44d1..e0bbda0 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libservicelog Version: 1.1.11 Release: 0 @@ -22,7 +23,10 @@ Summary: Servicelog Database and Library License: LGPL-2.0+ Group: System/Libraries Requires: libservicelog-library +BuildRequires: autoconf +BuildRequires: automake BuildRequires: librtas-devel +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,7 +75,6 @@ Contains header files for building with libservicelog. %build autoreconf -fiv -export CFLAGS="%{optflags}" %configure --with-pic --disable-static make %{?_smp_mflags}