Hello community, here is the log from the commit of package libservicelog for openSUSE:Factory checked in at 2011-11-07 14:20:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libservicelog (Old) and /work/SRC/openSUSE:Factory/.libservicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libservicelog", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes 2011-09-23 02:10:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libservicelog.new/libservicelog.changes 2011-11-07 14:20:37.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 2 12:31:42 UTC 2011 - [email protected] + +- update to 1.1.11 + - new build requires librtas-devel pkg-config + - reworked patches + - Drop libservicelog.warnings.patch, + libservicelog.sqlite-include.patch + libservicelog-sqlite_fixes.patch + - Fix package description typo + - ppc,ppc64 exclusive package as it is requires librtas + +------------------------------------------------------------------- Old: ---- libservicelog-1.0.1.tar.bz2 libservicelog-sqlite_fixes.patch libservicelog.sqlite-include.patch libservicelog.warnings.patch New: ---- libservicelog-1.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libservicelog.spec ++++++ --- /var/tmp/diff_new_pack.xoWjyY/_old 2011-11-07 14:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xoWjyY/_new 2011-11-07 14:21:03.000000000 +0100 @@ -18,27 +18,25 @@ Name: libservicelog -Version: 1.0.1 -Release: 9 +Version: 1.1.11 +Release: 1 Summary: Servicelog Database and Library Requires: libservicelog-library -BuildRequires: sqlite-devel +BuildRequires: sqlite3-devel librtas-devel pkg-config Group: System/Libraries License: LGPLv2.0+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://linux-diag.sourceforge.net/servicelog/ +ExclusiveArch: ppc ppc64 Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.bz2 Source1: baselibs.conf Source2: libservicelog-rpmlintrc Patch0: libservicelog.install.patch -Patch1: libservicelog.warnings.patch -Patch2: libservicelog.sqlite-include.patch -Patch3: libservicelog-sqlite_fixes.patch Patch4: libservicelog-pkgconfig.patch Patch5: libservicelog-printf_types.patch %description -The libservicelgo package contains a library to create and maintain a +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 the logging of service procedures that have been performed upon the @@ -51,14 +49,14 @@ Mike Strosaker <[email protected]> Nathan Fontenot <[email protected]> -%package -n libservicelog-1_0-1 +%package -n libservicelog-1_1-1 License: LGPLv2.0+ Summary: Servicelog Database and Library Group: System/Libraries Provides: libservicelog-library -%description -n libservicelog-1_0-1 -The libservicelgo package contains a library to create and maintain a +%description -n libservicelog-1_1-1 +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 the logging of service procedures that have been performed upon the @@ -76,6 +74,7 @@ Summary: Development files for libservicelog Group: Development/Libraries/Other Requires: %{name} = %{version} glibc-devel +Requires: libservicelog-1_1-1 %description devel Contains header files for building with libservicelog. @@ -89,10 +88,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0 %patch4 %patch5 @@ -111,9 +107,9 @@ %pre /usr/sbin/groupadd -r service || echo groupadd service failed -%post -n libservicelog-1_0-1 -p /sbin/ldconfig +%post -n libservicelog-1_1-1 -p /sbin/ldconfig -%postun -n libservicelog-1_0-1 -p /sbin/ldconfig +%postun -n libservicelog-1_1-1 -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -121,7 +117,7 @@ %attr( 754, root, service ) %dir /var/lib/servicelog %attr( 644, root, service ) /var/lib/servicelog/servicelog.db -%files -n libservicelog-1_0-1 +%files -n libservicelog-1_1-1 %defattr(-,root,root,-) %{_libdir}/lib*.so.* # dlopen object ++++++ libservicelog-1.0.1.tar.bz2 -> libservicelog-1.1.11.tar.bz2 ++++++ ++++ 106875 lines of diff (skipped) ++++++ libservicelog-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.xoWjyY/_old 2011-11-07 14:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xoWjyY/_new 2011-11-07 14:21:03.000000000 +0100 @@ -1,20 +1,16 @@ -Index: src/servicelog-1.pc.in -=================================================================== ---- src/servicelog-1.pc.in.orig 2008-03-06 01:24:51.000000000 +0100 -+++ src/servicelog-1.pc.in 2010-04-14 19:58:24.503511195 +0200 -@@ -6,5 +6,5 @@ includedir=@includedir@ +--- 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_LIBRARY_NAME@-@GENERIC_API_VERSION@ --Cflags: -I${includedir}/@GENERIC_LIBRARY_NAME@-@GENERIC_API_VERSION@ -+Libs: @LIBS_LIBDIR@ -lsqlite3 -l@GENERIC_LIBRARY_NAME@ +-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@ -Index: configure.ac -=================================================================== ---- configure.ac.orig 2008-08-17 00:15:33.000000000 +0200 -+++ configure.ac 2010-04-14 20:00:54.851453776 +0200 -@@ -70,5 +70,15 @@ AC_FUNC_STAT +--- 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 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([memset strerror strtoull uname]) @@ -27,6 +23,6 @@ +fi +AC_MSG_RESULT(${use_libdir}) +AC_SUBST(LIBS_LIBDIR) -+ ++ AC_CONFIG_FILES([Makefile src/Makefile libservicelog.spec src/servicelog-1.pc]) AC_OUTPUT ++++++ libservicelog-printf_types.patch ++++++ --- /var/tmp/diff_new_pack.xoWjyY/_old 2011-11-07 14:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xoWjyY/_new 2011-11-07 14:21:03.000000000 +0100 @@ -1,8 +1,6 @@ -Index: src/event.c -=================================================================== ---- src/event.c.orig 2010-03-24 15:19:20.000000000 +0100 -+++ src/event.c 2010-04-14 19:25:11.475501395 +0200 -@@ -100,7 +100,7 @@ put_blob(sqlite3 *db, char *table, uint6 +--- src/event.c.orig 2011-11-02 13:02:09.000000000 +0100 ++++ src/event.c 2011-11-02 13:01:05.000000000 +0100 +@@ -101,7 +101,7 @@ char query[80]; sqlite3_stmt *stmt; @@ -11,12 +9,12 @@ table, column, row); do { -@@ -577,7 +577,7 @@ servicelog_event_query(servicelog *slog, - while (e) { - /* Retrieve any callouts associated with this event */ - snprintf(buf, 512, "SELECT * FROM callouts WHERE " -- "event_id = %lld", e->id); -+ "event_id = %llu", e->id); - rc = sqlite3_exec(slog->db, buf, build_callout, &(e->callouts), - &err); +@@ -588,7 +588,7 @@ + retrieve_fcn = addl_data_fcns[e->type].retrieve; + snprintf(buf, 512, "SELECT * FROM %s WHERE " +- "event_id = %lld", table, e->id); ++ "event_id = %llu", table, e->id); + + rc = sqlite3_exec(slog->db, buf, retrieve_fcn, e, &err); + if (rc != SQLITE_OK) { ++++++ libservicelog.install.patch ++++++ --- /var/tmp/diff_new_pack.xoWjyY/_old 2011-11-07 14:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.xoWjyY/_new 2011-11-07 14:21:03.000000000 +0100 @@ -1,11 +1,7 @@ ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,5 +19,5 @@ library_includedir = ${includedir}/servi - library_include_HEADERS = servicelog-1/servicelog.h +--- Makefile.am.orig 2011-11-02 12:25:32.000000000 +0100 ++++ Makefile.am 2011-11-02 12:25:49.000000000 +0100 +@@ -19,5 +19,5 @@ + library_include_HEADERS = servicelog-1/servicelog.h servicelog-1/libservicelog.h install-exec-hook: - install -D --mode=754 --group=service servicelog.db \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
