From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 1 Jul 2015 20:14:56 +0000 (+0200)
Subject: - up to 1.1.15
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7ce5edad00448002796b91c5ff010885b56bcc9d;p=packages%2Flibservicelog.git

- up to 1.1.15
- updated link,install patches
---

diff --git a/libservicelog-install.patch b/libservicelog-install.patch
index 6600db3..1a31e69 100644
--- a/libservicelog-install.patch
+++ b/libservicelog-install.patch
@@ -1,10 +1,10 @@
---- libservicelog-1.1.11/Makefile.am.orig	2011-03-14 22:34:44.000000000 +0100
-+++ libservicelog-1.1.11/Makefile.am	2011-05-01 20:20:27.528426964 +0200
-@@ -17,7 +17,3 @@
- 
- library_includedir = ${includedir}/servicelog-1/
- library_include_HEADERS = servicelog-1/servicelog.h servicelog-1/libservicelog.h
+--- libservicelog-1.1.15/Makefile.am.orig	2015-07-01 21:59:50.081333602 +0200
++++ libservicelog-1.1.15/Makefile.am	2015-07-01 22:01:42.041328904 +0200
+@@ -47,7 +47,3 @@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ libtool: $(LIBTOOL_DEPS)
+ 	$(SHELL) ./config.status --recheck
 -
 -install-exec-hook:
--	install -D --mode=754 --group=service servicelog.db \
+-	install -D --mode=754 servicelog.db \
 -		${DESTDIR}/var/lib/servicelog/servicelog.db
diff --git a/libservicelog-link.patch b/libservicelog-link.patch
index 955d7df..d4c9ebc 100644
--- a/libservicelog-link.patch
+++ b/libservicelog-link.patch
@@ -8,16 +8,21 @@
 +Libs: -L${libdir} -l@GENERIC_PACKAGE_NAME@
 +Libs.private: -lsqlite3 -lrtas -lrtasevent
  Cflags: -I${includedir}/@GENERIC_PACKAGE_NAME@-@GENERIC_API_VERSION@
---- libservicelog-1.1.11/src/Makefile.am.orig	2011-03-14 22:34:44.000000000 +0100
-+++ libservicelog-1.1.11/src/Makefile.am	2011-05-01 20:26:36.195105975 +0200
-@@ -35,9 +35,9 @@
+--- libservicelog-1.1.15/Makefile.am.orig	2015-07-01 21:59:11.414668558 +0200
++++ libservicelog-1.1.15/Makefile.am	2015-07-01 21:59:15.924668369 +0200
+@@ -19,7 +19,6 @@
+ 
+ #AM_CPPFLAGS	= -I.. -I./servicelog-1/
+ AM_CFLAGS	= -Wall -g -I.. -I./servicelog-1 -DDEST_DIR='"${exec_prefix}"'
+-AM_LDFLAGS	= -lsqlite3 -lrtas -lrtasevent
+ 
+ library_include_HEADERS = servicelog-1/servicelog.h servicelog-1/libservicelog.h
+ noinst_HEADERS = src/slog_internal.h
+@@ -43,6 +42,7 @@
  
  libservicelog_la_LDFLAGS = -module -version-info \
  	@GENERIC_API_VERSION@ -release @GENERIC_RELEASE@
 +libservicelog_la_LIBADD = -lsqlite3 -lrtas -lrtasevent
  
- AM_CFLAGS	= -Wall -g -DDEST_DIR='"${exec_prefix}"'
--AM_LDFLAGS	= -lsqlite3 -lrtas -lrtasevent
- 
  LIBTOOL_DEPS = @LIBTOOL_DEPS@
  libtool: $(LIBTOOL_DEPS)
diff --git a/libservicelog.spec b/libservicelog.spec
index 03de71f..b60c958 100644
--- a/libservicelog.spec
+++ b/libservicelog.spec
@@ -1,12 +1,12 @@
 Summary:	Library for access to the system servicelog
 Summary(pl.UTF-8):	Biblioteka dostępu do logu zdarzeń serwisowych w systemie
 Name:		libservicelog
-Version:	1.1.12
+Version:	1.1.15
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
-# Source0-md5:	0e40890ade6dc74e0d4f743ed108bfb1
+# Source0-md5:	be1fecbcb5df2d4d3d9b3ebcd6eacaf3
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-install.patch
 URL:		http://linux-diag.sourceforge.net/servicelog/
@@ -16,7 +16,7 @@ BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	librtas-devel
 BuildRequires:	libtool
-BuildRequires:	sqlite3-devel
+BuildRequires:	sqlite3-devel >= 3
 # requires ppc-specific librtas
 ExclusiveArch:	ppc ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_libdir}/libservicelog-1.1.so.*.*.*
 %ghost %{_libdir}/libservicelog-1.1.so.1
 %dir /var/lib/servicelog