pool/libservicelog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 247543 from home:jloeser

Browse Source 
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
This commit is contained in:
Marcus Meissner 2014-09-04 13:18:27 +00:00 committed by Git OBS Bridge
parent 674ff76e2d
commit 98ed964b71
6 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libservicelog-1.1.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0c750363efc4279fad14f5b3d344689ea369ab639382a9c7bd47000b5e60287
size 392906

3
libservicelog-1.1.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:981c85cef132153fde7da0635fd65f487d1f90adf0e929cef54b5ecc9d43230d
size 392259

19
libservicelog-lib_version.patch
View File

@ -1,17 +1,14 @@
Index: src/Makefile.am Index: libservicelog-1.1.15/Makefile.am
=================================================================== ===================================================================
--- src/Makefile.am.orig --- libservicelog-1.1.15.orig/Makefile.am
+++ src/Makefile.am +++ libservicelog-1.1.15/Makefile.am
@@ -33,8 +33,10 @@ AM_LFLAGS = -Pv29nfy_ -olex.yy.c @@ -41,8 +41,7 @@ AM_YFLAGS = -d -p v29nfy_
pkgconfigdir = $(libdir)/pkgconfig # -P for the code prefixes, -o because autoconf wants the standard file name
pkgconfig_DATA = servicelog-1.pc AM_LFLAGS = -Pv29nfy_ -olex.yy.c
-libservicelog_la_LDFLAGS = -module -version-info \ -libservicelog_la_LDFLAGS = -module -version-info \
- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ - @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@ +libservicelog_la_LDFLAGS = -version-info @GENERIC_API_VERSION@
AM_CFLAGS = -Wall -g -DDEST_DIR='"${exec_prefix}"' LIBTOOL_DEPS = @LIBTOOL_DEPS@
AM_LDFLAGS = -lsqlite3 -lrtas -lrtasevent libtool: $(LIBTOOL_DEPS)

34
libservicelog-pkgconfig.patch
View File

@ -1,16 +1,8 @@
--- src/servicelog-1.pc.in.orig 2011-11-02 12:51:24.000000000 +0100 Index: libservicelog-1.1.15/configure.ac
+++ src/servicelog-1.pc.in 2011-11-02 12:52:56.000000000 +0100 ===================================================================
@@ -6,5 +6,5 @@ --- libservicelog-1.1.15.orig/configure.ac
Name: servicelog +++ libservicelog-1.1.15/configure.ac
Description: Library for access to the system servicelog @@ -81,5 +81,15 @@ AC_FUNC_STAT
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 @@
AC_FUNC_STRFTIME AC_FUNC_STRFTIME
AC_CHECK_FUNCS([memset strerror strtoull uname]) AC_CHECK_FUNCS([memset strerror strtoull uname])
@ -23,6 +15,18 @@
+fi +fi
+AC_MSG_RESULT(${use_libdir}) +AC_MSG_RESULT(${use_libdir})
+AC_SUBST(LIBS_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 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@

9
libservicelog.changes
View File

@ -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 Fri Jan 17 10:31:57 UTC 2014 - jloeser@suse.com
- version update to 1.1.14 (FATE#315456) - version update to 1.1.14 (FATE#315456)

8
libservicelog.spec
View File

@ -19,7 +19,7 @@
%define so_version 1 %define so_version 1
Name: libservicelog Name: libservicelog
Version: 1.1.14 Version: 1.1.15
Release: 0 Release: 0
Summary: Servicelog Database and Library Summary: Servicelog Database and Library
License: LGPL-2.0+ License: LGPL-2.0+
@ -74,8 +74,8 @@ Contains header files for building with libservicelog.
%prep %prep
%setup -q %setup -q
%patch0 %patch0 -p1
%patch1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%build %build
@ -96,7 +96,7 @@ make %{?_smp_mflags}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING NEWS AUTHORS %doc COPYING AUTHORS
%attr( 754, root, service ) %dir /var/lib/servicelog %attr( 754, root, service ) %dir /var/lib/servicelog
%attr( 644, root, service ) /var/lib/servicelog/servicelog.db %attr( 644, root, service ) /var/lib/servicelog/servicelog.db