diff --git a/.gitignore b/.gitignore index b84753a..9870f13 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libservicelog-1.1.13.tar.gz +SOURCES/libservicelog-1.1.15.tar.gz diff --git a/.libservicelog.metadata b/.libservicelog.metadata index a963c21..c002496 100644 --- a/.libservicelog.metadata +++ b/.libservicelog.metadata @@ -1 +1 @@ -fa56e034e23f41872d975ad963cae91b927fa8f8 SOURCES/libservicelog-1.1.13.tar.gz +169a72afbeff3a651d7951473d322285ee29117f SOURCES/libservicelog-1.1.15.tar.gz diff --git a/SOURCES/libservicelog-1.1.15-libs.patch b/SOURCES/libservicelog-1.1.15-libs.patch new file mode 100644 index 0000000..3b0cb40 --- /dev/null +++ b/SOURCES/libservicelog-1.1.15-libs.patch @@ -0,0 +1,12 @@ +diff -up libservicelog-1.1.15/Makefile.am.libs libservicelog-1.1.15/Makefile.am +--- libservicelog-1.1.15/Makefile.am.libs 2014-08-21 10:43:46.114302182 +0200 ++++ libservicelog-1.1.15/Makefile.am 2014-08-21 10:46:11.242200417 +0200 +@@ -42,7 +42,7 @@ AM_YFLAGS = -d -p v29nfy_ + AM_LFLAGS = -Pv29nfy_ -olex.yy.c + + libservicelog_la_LDFLAGS = -module -version-info \ +- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ ++ @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ $(AM_LDFLAGS) + + LIBTOOL_DEPS = @LIBTOOL_DEPS@ + libtool: $(LIBTOOL_DEPS) diff --git a/SOURCES/libservicelog-1.1.9-libs.patch b/SOURCES/libservicelog-1.1.9-libs.patch deleted file mode 100644 index f60086d..0000000 --- a/SOURCES/libservicelog-1.1.9-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libservicelog-1.1/src/Makefile.am.libs libservicelog-1.1/src/Makefile.am ---- libservicelog-1.1/src/Makefile.am.libs 2010-05-17 13:24:46.297064301 -0400 -+++ libservicelog-1.1/src/Makefile.am 2010-05-17 13:26:07.737064638 -0400 -@@ -34,7 +34,7 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = servicelog-1.pc - - libservicelog_la_LDFLAGS = -module -version-info \ -- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ -+ @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@ $(AM_LDFLAGS) - - AM_CFLAGS = -Wall -g -DDEST_DIR='"${exec_prefix}"' - AM_LDFLAGS = -lsqlite3 -lrtas -lrtasevent diff --git a/SPECS/libservicelog.spec b/SPECS/libservicelog.spec index aa5879d..4cf4324 100644 --- a/SPECS/libservicelog.spec +++ b/SPECS/libservicelog.spec @@ -1,6 +1,6 @@ Name: libservicelog -Version: 1.1.13 -Release: 3%{?dist} +Version: 1.1.15 +Release: 2%{?dist} Summary: Servicelog Database and Library Group: System Environment/Libraries @@ -13,12 +13,13 @@ Requires(pre): shadow-utils BuildRequires: sqlite-devel autoconf libtool bison librtas-devel flex +Obsoletes: libservicelog(ppc) # because of librtas-devel -ExclusiveArch: ppc ppc64 ppc64le +ExclusiveArch: ppc64 ppc64le # Link with needed libraries -Patch0: libservicelog-1.1.9-libs.patch +Patch0: libservicelog-1.1.15-libs.patch %description The libservicelog package contains a library to create and maintain a @@ -66,7 +67,7 @@ getent group service >/dev/null || /usr/sbin/groupadd service %files %defattr(-,root,root,-) -%doc COPYING NEWS AUTHORS +%doc COPYING AUTHORS %{_libdir}/libservicelog-*.so.* %dir %attr(755, root, service) /var/lib/servicelog %verify(not md5 size mtime) %attr(644,root,service) /var/lib/servicelog/servicelog.db @@ -80,6 +81,17 @@ getent group service >/dev/null || /usr/sbin/groupadd service %changelog +* Mon Nov 10 2014 Jakub Čajka - 1.1.15-2 +- Related: #1161551 - librtas package update - rebuild + +* Thu Sep 04 2014 Jakub Čajka - 1.1.15-1 +- Related: #1088494 - [7.1 FEAT] libservicelog package update - ppc64 +Rebase to 1.1.15 + +* Wed Aug 13 2014 Jakub Čajka - 1.1.14-1 +- Resolves: #1088494 - [7.1 FEAT] libservicelog package update - ppc64 +- Related: #1098216 - [7.1 FEAT] libservicelog - drop 32bit package - ppc64 + * Wed Jan 08 2014 Phil Knirsch - 1.1.13-3 - Fixed build issue Resolves: rhbz#1048877