From 98ed964b71ac5be612456bc5896e65c8df8e2ff5af485d5679caf721ef4f8de4 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 4 Sep 2014 13:18:27 +0000 Subject: [PATCH] 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