Accepting request 126460 from devel:libraries:c_c++

Fix naming of shared library and package

OBS-URL: https://build.opensuse.org/request/show/126460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libservicelog?expand=0&rev=16

libservicelog-lib_version.patch

@@ -0,0 +1,17 @@
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am.orig	2011-03-14 22:34:44.000000000 +0100
++++ src/Makefile.am	2012-06-28 16:14:30.385936569 +0200
+@@ -33,8 +33,10 @@ AM_LFLAGS = -Pv29nfy_ -olex.yy.c
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = servicelog-1.pc
+ 
+-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

libservicelog.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 28 16:28:34 CEST 2012 - pth@suse.de
+
+- Using both -version-info and -release options for libtool is bogus,
+  therefore use version-info only and name shared library package
+  accordingly.
+- Adapt requires of -devel package.
+
 -------------------------------------------------------------------
 Tue Jan 31 16:01:42 CET 2012 - meissner@suse.de
 

libservicelog.spec

@@ -16,6 +16,8 @@
 #
 
 
+%define so_version 1
+
 Name:           libservicelog
 Version:        1.1.11
 Release:        0
@@ -38,6 +40,7 @@ Source2:        libservicelog-rpmlintrc
 Patch0:         libservicelog.install.patch
 Patch4:         libservicelog-pkgconfig.patch
 Patch5:         libservicelog-printf_types.patch
+Patch6:         libservicelog-lib_version.patch
 
 %description
 The libservicelog package contains a library to create and maintain a
@@ -46,12 +49,13 @@ 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 libservicelog-1_1-1
+
+%package -n     %{name}%{so_version}
 Summary:        Servicelog Database and Library
 Group:          System/Libraries
 Provides:       libservicelog-library
 
-%description  -n libservicelog-1_1-1
+%description  -n %{name}%{so_version}
 The libservicelog package contains a library to create and maintain a
 database for storing events related to system service.	This database 
 allows for the logging of serviceable and informational events, and for
@@ -61,8 +65,9 @@ system.
 %package        devel
 Summary:        Development files for libservicelog
 Group:          Development/Libraries/Other
-Requires:       %{name} = %{version} glibc-devel
+Requires:       %{name} = %{version}
-Requires:       libservicelog-1_1-1
+Requires:       %{name}%{so_version} = %{version}
+Requires:       glibc-devel
 
 %description    devel
 Contains header files for building with libservicelog.
@@ -72,6 +77,7 @@ Contains header files for building with libservicelog.
 %patch0 
 %patch4
 %patch5
+%patch6
 
 %build
 autoreconf -fiv
@@ -85,9 +91,9 @@ make %{?_smp_mflags}
 %pre
 /usr/sbin/groupadd -r service || echo groupadd service failed
 
-%post  -n libservicelog-1_1-1 -p /sbin/ldconfig
+%post  -n %{name}%{so_version} -p /sbin/ldconfig
 
-%postun  -n libservicelog-1_1-1 -p /sbin/ldconfig
+%postun  -n %{name}%{so_version} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -95,7 +101,7 @@ make %{?_smp_mflags}
 %attr( 754, root, service ) %dir /var/lib/servicelog
 %attr( 644, root, service ) /var/lib/servicelog/servicelog.db
 
-%files -n libservicelog-1_1-1
+%files -n %{name}%{so_version}
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 # dlopen object