From 98ed964b71ac5be612456bc5896e65c8df8e2ff5af485d5679caf721ef4f8de4 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 4 Sep 2014 13:18:27 +0000 Subject: [PATCH 1/2] Accepting request 247543 from home:jloeser version update to 1.1.15 (BNC#894856) OBS-URL: https://build.opensuse.org/request/show/247543 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=28 --- libservicelog-1.1.14.tar.gz | 3 --- libservicelog-1.1.15.tar.gz | 3 +++ libservicelog-lib_version.patch | 19 ++++++++---------- libservicelog-pkgconfig.patch | 34 ++++++++++++++++++--------------- libservicelog.changes | 9 +++++++++ libservicelog.spec | 8 ++++---- 6 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 libservicelog-1.1.14.tar.gz create mode 100644 libservicelog-1.1.15.tar.gz diff --git a/libservicelog-1.1.14.tar.gz b/libservicelog-1.1.14.tar.gz deleted file mode 100644 index 24ab4ca..0000000 --- a/libservicelog-1.1.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0c750363efc4279fad14f5b3d344689ea369ab639382a9c7bd47000b5e60287 -size 392906 diff --git a/libservicelog-1.1.15.tar.gz b/libservicelog-1.1.15.tar.gz new file mode 100644 index 0000000..d7b52ae --- /dev/null +++ b/libservicelog-1.1.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:981c85cef132153fde7da0635fd65f487d1f90adf0e929cef54b5ecc9d43230d +size 392259 diff --git a/libservicelog-lib_version.patch b/libservicelog-lib_version.patch index f884cd1..5d51391 100644 --- a/libservicelog-lib_version.patch +++ b/libservicelog-lib_version.patch @@ -1,17 +1,14 @@ -Index: src/Makefile.am +Index: libservicelog-1.1.15/Makefile.am =================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -33,8 +33,10 @@ AM_LFLAGS = -Pv29nfy_ -olex.yy.c - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = servicelog-1.pc +--- libservicelog-1.1.15.orig/Makefile.am ++++ libservicelog-1.1.15/Makefile.am +@@ -41,8 +41,7 @@ AM_YFLAGS = -d -p v29nfy_ + # -P for the code prefixes, -o because autoconf wants the standard file name + AM_LFLAGS = -Pv29nfy_ -olex.yy.c -libservicelog_la_LDFLAGS = -module -version-info \ - @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ -+#libservicelog_la_LDFLAGS = -module -version-info \ -+# @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ -+ +libservicelog_la_LDFLAGS = -version-info @GENERIC_API_VERSION@ - AM_CFLAGS = -Wall -g -DDEST_DIR='"${exec_prefix}"' - AM_LDFLAGS = -lsqlite3 -lrtas -lrtasevent + LIBTOOL_DEPS = @LIBTOOL_DEPS@ + libtool: $(LIBTOOL_DEPS) diff --git a/libservicelog-pkgconfig.patch b/libservicelog-pkgconfig.patch index 531e9eb..25d5b90 100644 --- a/libservicelog-pkgconfig.patch +++ b/libservicelog-pkgconfig.patch @@ -1,16 +1,8 @@ ---- src/servicelog-1.pc.in.orig 2011-11-02 12:51:24.000000000 +0100 -+++ src/servicelog-1.pc.in 2011-11-02 12:52:56.000000000 +0100 -@@ -6,5 +6,5 @@ - Name: servicelog - Description: Library for access to the system servicelog - Version: @VERSION@ --Libs: -L${libdir} -lsqlite3 -l@GENERIC_PACKAGE_NAME@ --Cflags: -I${includedir}/@GENERIC_PACKAGE_NAME@-@GENERIC_API_VERSION@ -+Libs: @LIBS_LIBDIR@ -lsqlite3 -l@GENERIC_PACKAGE_NAME@ -+Cflags: -I${includedir}/servicelog-@GENERIC_API_VERSION@ ---- configure.ac.orig 2011-11-02 12:54:39.000000000 +0100 -+++ configure.ac 2011-11-02 12:56:44.000000000 +0100 -@@ -74,5 +74,15 @@ +Index: libservicelog-1.1.15/configure.ac +=================================================================== +--- libservicelog-1.1.15.orig/configure.ac ++++ libservicelog-1.1.15/configure.ac +@@ -81,5 +81,15 @@ AC_FUNC_STAT AC_FUNC_STRFTIME AC_CHECK_FUNCS([memset strerror strtoull uname]) @@ -23,6 +15,18 @@ +fi +AC_MSG_RESULT(${use_libdir}) +AC_SUBST(LIBS_LIBDIR) -+ - AC_CONFIG_FILES([Makefile src/Makefile libservicelog.spec src/servicelog-1.pc]) ++ + AC_CONFIG_FILES([Makefile libservicelog.spec src/servicelog-1.pc]) AC_OUTPUT +Index: libservicelog-1.1.15/src/servicelog-1.pc.in +=================================================================== +--- libservicelog-1.1.15.orig/src/servicelog-1.pc.in ++++ libservicelog-1.1.15/src/servicelog-1.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: servicelog + Description: Library for access to the system servicelog + Version: @VERSION@ +-Libs: -L${libdir} -lsqlite3 -l@GENERIC_PACKAGE_NAME@ +-Cflags: -I${includedir}/@GENERIC_PACKAGE_NAME@-@GENERIC_API_VERSION@ ++Libs: @LIBS_LIBDIR@ -lsqlite3 -l@GENERIC_PACKAGE_NAME@ ++Cflags: -I${includedir}/servicelog-@GENERIC_API_VERSION@ diff --git a/libservicelog.changes b/libservicelog.changes index dc80f59..21e14fc 100644 --- a/libservicelog.changes +++ b/libservicelog.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Sep 4 12:56:42 UTC 2014 - jloeser@suse.com + +- version update to 1.1.15 (BNC#894856) + - Cleanup build tools (configure.ac and Makefile.am) + +- modified patches: + * libservicelog-lib_version.patch + * libservicelog-pkgconfig.patch +------------------------------------------------------------------- Fri Jan 17 10:31:57 UTC 2014 - jloeser@suse.com - version update to 1.1.14 (FATE#315456) diff --git a/libservicelog.spec b/libservicelog.spec index ab4b89c..844d6ab 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -19,7 +19,7 @@ %define so_version 1 Name: libservicelog -Version: 1.1.14 +Version: 1.1.15 Release: 0 Summary: Servicelog Database and Library License: LGPL-2.0+ @@ -74,8 +74,8 @@ Contains header files for building with libservicelog. %prep %setup -q -%patch0 -%patch1 +%patch0 -p1 +%patch1 -p1 %patch2 -p1 %build @@ -96,7 +96,7 @@ make %{?_smp_mflags} %files %defattr(-,root,root,-) -%doc COPYING NEWS AUTHORS +%doc COPYING AUTHORS %attr( 754, root, service ) %dir /var/lib/servicelog %attr( 644, root, service ) /var/lib/servicelog/servicelog.db From 12e746ecd58db86c31262defe92aa6681dac8425965bdc2d3e8113be202a1778 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 5 Sep 2014 07:35:35 +0000 Subject: [PATCH 2/2] Accepting request 247561 from home:jengelh:branches:devel:libraries:c_c++ - Remove libservicelog-lib_version.patch, there is no reason provided to have it in the first place. - Remove libservicelog-pkgconfig.patch; there is nothing wrong with -L${libdir} in .pc files. OBS-URL: https://build.opensuse.org/request/show/247561 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=29 --- baselibs.conf | 4 +-- libservicelog-lib_version.patch | 14 --------- libservicelog-pkgconfig.patch | 32 --------------------- libservicelog.changes | 14 +++++++++ libservicelog.spec | 50 +++++++++++++++------------------ 5 files changed, 38 insertions(+), 76 deletions(-) delete mode 100644 libservicelog-lib_version.patch delete mode 100644 libservicelog-pkgconfig.patch diff --git a/baselibs.conf b/baselibs.conf index 869f1d2..7587167 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ -libservicelog-1_0-1 +libservicelog-1_1-1 obsoletes "libservicelog- <= " provides "libservicelog- = " libservicelog-devel requires -libservicelog- - requires "libservicelog-1_0-1- = " + requires "libservicelog-1_1-1- = " diff --git a/libservicelog-lib_version.patch b/libservicelog-lib_version.patch deleted file mode 100644 index 5d51391..0000000 --- a/libservicelog-lib_version.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libservicelog-1.1.15/Makefile.am -=================================================================== ---- libservicelog-1.1.15.orig/Makefile.am -+++ libservicelog-1.1.15/Makefile.am -@@ -41,8 +41,7 @@ AM_YFLAGS = -d -p v29nfy_ - # -P for the code prefixes, -o because autoconf wants the standard file name - AM_LFLAGS = -Pv29nfy_ -olex.yy.c - --libservicelog_la_LDFLAGS = -module -version-info \ -- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ -+libservicelog_la_LDFLAGS = -version-info @GENERIC_API_VERSION@ - - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - libtool: $(LIBTOOL_DEPS) diff --git a/libservicelog-pkgconfig.patch b/libservicelog-pkgconfig.patch deleted file mode 100644 index 25d5b90..0000000 --- a/libservicelog-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: libservicelog-1.1.15/configure.ac -=================================================================== ---- libservicelog-1.1.15.orig/configure.ac -+++ libservicelog-1.1.15/configure.ac -@@ -81,5 +81,15 @@ AC_FUNC_STAT - AC_FUNC_STRFTIME - AC_CHECK_FUNCS([memset strerror strtoull uname]) - -+AC_MSG_CHECKING([Whether to put -L\${libdir} in .pc]) -+if test -z "$(echo $libdir|fgrep /usr)"; then -+ LIBS_LIBDIR='-L${libdir}' -+ use_libdir=yes -+else -+ use_libdir=no -+fi -+AC_MSG_RESULT(${use_libdir}) -+AC_SUBST(LIBS_LIBDIR) -+ - AC_CONFIG_FILES([Makefile libservicelog.spec src/servicelog-1.pc]) - AC_OUTPUT -Index: libservicelog-1.1.15/src/servicelog-1.pc.in -=================================================================== ---- libservicelog-1.1.15.orig/src/servicelog-1.pc.in -+++ libservicelog-1.1.15/src/servicelog-1.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: servicelog - Description: Library for access to the system servicelog - Version: @VERSION@ --Libs: -L${libdir} -lsqlite3 -l@GENERIC_PACKAGE_NAME@ --Cflags: -I${includedir}/@GENERIC_PACKAGE_NAME@-@GENERIC_API_VERSION@ -+Libs: @LIBS_LIBDIR@ -lsqlite3 -l@GENERIC_PACKAGE_NAME@ -+Cflags: -I${includedir}/servicelog-@GENERIC_API_VERSION@ diff --git a/libservicelog.changes b/libservicelog.changes index 21e14fc..57ec216 100644 --- a/libservicelog.changes +++ b/libservicelog.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Sep 4 13:26:49 UTC 2014 - jengelh@inai.de + +- baselibs.conf did not match with the shared library package +- Remove libservicelog-lib_version.patch, there is no reason + provided to have it in the first place. +- Remove libservicelog-pkgconfig.patch; there is nothing wrong + with -L${libdir} in .pc files. +- Remove dlopen hacks; the packages ppc64-diag and servicelog which + OBS lists as dependants use no visible call to dlopen but do + a compile-time link. +- As the public header servicelog.h #includes , + Reqiures: sqlite3-devel is needed for libservicelog-devel. + ------------------------------------------------------------------- Thu Sep 4 12:56:42 UTC 2014 - jloeser@suse.com diff --git a/libservicelog.spec b/libservicelog.spec index 844d6ab..33f8329 100644 --- a/libservicelog.spec +++ b/libservicelog.spec @@ -16,15 +16,22 @@ # -%define so_version 1 - Name: libservicelog +%define lname libservicelog-1_1-1 Version: 1.1.15 Release: 0 Summary: Servicelog Database and Library License: LGPL-2.0+ Group: System/Libraries -Requires: libservicelog-library +Url: http://linux-diag.sourceforge.net/servicelog/ + +#Git-Clone: git://git.code.sf.net/p/linux-diag/libservicelog +#Git-Web: http://sourceforge.net/p/linux-diag/libservicelog/ +Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz +Source1: baselibs.conf +Source2: libservicelog-rpmlintrc +PreReq: %{_sbindir}/groupadd +Patch2: libservicelog-printf_types.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: librtas-devel @@ -32,32 +39,23 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://linux-diag.sourceforge.net/servicelog/ ExclusiveArch: ppc ppc64 ppc64le -Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Source1: baselibs.conf -Source2: libservicelog-rpmlintrc -PreReq: %{_sbindir}/groupadd -Patch0: libservicelog-pkgconfig.patch -Patch1: libservicelog-lib_version.patch -Patch2: libservicelog-printf_types.patch %description The libservicelog package contains a library to create and maintain a -database for storing events related to system service. This database +database for storing events related to system service. This database allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. - -%package -n %{name}%{so_version} +%package -n %lname Summary: Servicelog Database and Library Group: System/Libraries -Provides: libservicelog-library +Requires: %name -%description -n %{name}%{so_version} +%description -n %lname The libservicelog package contains a library to create and maintain a -database for storing events related to system service. This database +database for storing events related to system service. This database allows for the logging of serviceable and informational events, and for the logging of service procedures that have been performed upon the system. @@ -65,17 +63,15 @@ system. %package devel Summary: Development files for libservicelog Group: Development/Libraries/Other -Requires: %{name} = %{version} -Requires: %{name}%{so_version} = %{version} +Requires: %lname = %version Requires: glibc-devel +Requires: sqlite3-devel %description devel Contains header files for building with libservicelog. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %patch2 -p1 %build @@ -84,15 +80,14 @@ autoreconf -fiv make %{?_smp_mflags} %install -%{makeinstall} +%make_install %__rm -f %{buildroot}%{_libdir}/*.la %pre /usr/sbin/groupadd -r service || echo groupadd service failed -%post -n %{name}%{so_version} -p /sbin/ldconfig - -%postun -n %{name}%{so_version} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -100,15 +95,14 @@ make %{?_smp_mflags} %attr( 754, root, service ) %dir /var/lib/servicelog %attr( 644, root, service ) /var/lib/servicelog/servicelog.db -%files -n %{name}%{so_version} +%files -n %lname %defattr(-,root,root,-) %{_libdir}/lib*.so.* -# dlopen object -%{_libdir}/*.so %files devel %defattr(-,root,root,-) %{_includedir}/servicelog-1 %{_libdir}/pkgconfig/servicelog-1.pc +%{_libdir}/*.so %changelog