Hello community, here is the log from the commit of package libservicelog for openSUSE:Factory checked in at 2012-06-29 13:24:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libservicelog (Old) and /work/SRC/openSUSE:Factory/.libservicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libservicelog", Maintainer is "JLoeser@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes 2012-02-01 09:58:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libservicelog.new/libservicelog.changes 2012-06-29 13:25:04.000000000 +0200 @@ -1,0 +2,8 @@ +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. + +------------------------------------------------------------------- New: ---- libservicelog-lib_version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libservicelog.spec ++++++ --- /var/tmp/diff_new_pack.eZdnVi/_old 2012-06-29 13:25:05.000000000 +0200 +++ /var/tmp/diff_new_pack.eZdnVi/_new 2012-06-29 13:25:05.000000000 +0200 @@ -16,6 +16,8 @@ # +%define so_version 1 + Name: libservicelog Version: 1.1.11 Release: 0 @@ -38,6 +40,7 @@ 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 @@ 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 @@ %package devel Summary: Development files for libservicelog Group: Development/Libraries/Other -Requires: %{name} = %{version} glibc-devel -Requires: libservicelog-1_1-1 +Requires: %{name} = %{version} +Requires: %{name}%{so_version} = %{version} +Requires: glibc-devel %description devel Contains header files for building with libservicelog. @@ -72,6 +77,7 @@ %patch0 %patch4 %patch5 +%patch6 %build autoreconf -fiv @@ -85,9 +91,9 @@ %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 @@ %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 ++++++ libservicelog-lib_version.patch ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org