From 79410dff49241c2b12f0273b47fb7588f6c6526d Mon Sep 17 00:00:00 2001
From: Roman Rakus <rrakus@fedoraproject.org>
Date: Fri, 14 May 2010 14:11:12 +0000
Subject: [PATCH] Update to 1.1.9

---
 .cvsignore                        |  2 +-
 libservicelog-1.0.1-install.patch | 10 ----------
 libservicelog-1.1.9-include.patch | 11 +++++++++++
 libservicelog-1.1.9-install.patch | 10 ++++++++++
 libservicelog.spec                | 23 +++++++++++++++++------
 sources                           |  2 +-
 6 files changed, 40 insertions(+), 18 deletions(-)
 delete mode 100644 libservicelog-1.0.1-install.patch
 create mode 100644 libservicelog-1.1.9-include.patch
 create mode 100644 libservicelog-1.1.9-install.patch

diff --git a/.cvsignore b/.cvsignore
index 8f5688e..5d75180 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libservicelog-1.0.1.tar.gz
+libservicelog-1.1.9.tar.gz
diff --git a/libservicelog-1.0.1-install.patch b/libservicelog-1.0.1-install.patch
deleted file mode 100644
index 6be323a..0000000
--- a/libservicelog-1.0.1-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up libservicelog-1.0.1/Makefile.am.install libservicelog-1.0.1/Makefile.am
---- libservicelog-1.0.1/Makefile.am.install	2009-02-20 12:17:23.000000000 -0500
-+++ libservicelog-1.0.1/Makefile.am	2009-02-20 12:17:50.000000000 -0500
-@@ -19,5 +19,5 @@ library_includedir = ${includedir}/servi
- library_include_HEADERS = servicelog-1/servicelog.h
- 
- 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-1.1.9-include.patch b/libservicelog-1.1.9-include.patch
new file mode 100644
index 0000000..8528a17
--- /dev/null
+++ b/libservicelog-1.1.9-include.patch
@@ -0,0 +1,11 @@
+diff -up libservicelog-1.1/src/v29_notify_gram.y.include libservicelog-1.1/src/v29_notify_gram.y
+--- libservicelog-1.1/src/v29_notify_gram.y.include	2010-05-13 17:19:41.000000000 +0200
++++ libservicelog-1.1/src/v29_notify_gram.y	2010-05-13 17:19:55.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "../servicelog-1/libservicelog.h"
+ #include <malloc.h>
+ #include <assert.h>
++#include "v29_notify_gram.h"
+ 
+ static struct v29_sl_notify *notify;
+ static int *semantic_errors;
diff --git a/libservicelog-1.1.9-install.patch b/libservicelog-1.1.9-install.patch
new file mode 100644
index 0000000..cdea5f6
--- /dev/null
+++ b/libservicelog-1.1.9-install.patch
@@ -0,0 +1,10 @@
+diff -up libservicelog-1.1/Makefile.am.install libservicelog-1.1/Makefile.am
+--- libservicelog-1.1/Makefile.am.install	2009-10-30 04:32:27.000000000 +0100
++++ libservicelog-1.1/Makefile.am	2010-05-11 14:39:54.000000000 +0200
+@@ -19,5 +19,5 @@ library_includedir = ${includedir}/servi
+ library_include_HEADERS = servicelog-1/servicelog.h servicelog-1/libservicelog.h
+ 
+ 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.spec b/libservicelog.spec
index 6a60283..98d5645 100644
--- a/libservicelog.spec
+++ b/libservicelog.spec
@@ -1,6 +1,6 @@
 Name:           libservicelog
-Version:        1.0.1
-Release:        3%{?dist}
+Version:        1.1.9
+Release:        1%{?dist}
 Summary:        Servicelog Database and Library
 
 Group:          System Environment/Libraries
@@ -11,9 +11,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre):       shadow-utils
 
-BuildRequires:  sqlite-devel autoconf libtool
+BuildRequires:  sqlite-devel autoconf libtool bison librtas-devel flex
 
-Patch0: libservicelog-1.0.1-install.patch
+# because of librtas-devel
+ExclusiveArch: ppc ppc64
+
+
+# Don't use non existin group during install 
+Patch0: libservicelog-1.1.9-install.patch
+
+# Added missing include
+Patch1: libservicelog-1.1.9-include.patch
 
 %description
 The libservicelog package contains a library to create and maintain a
@@ -33,9 +41,9 @@ Contains header files for building with libservicelog.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.1
 %patch0 -p1 -b .install
-
+%patch1 -p1 -b .include
 
 %build
 autoreconf -fiv
@@ -75,6 +83,9 @@ getent group service >/dev/null || /usr/sbin/groupadd service
 
 
 %changelog
+* Tue May 11 2010 Roman Rakus <rrakus@redhat.com> - 1.1.9-1
+- Update to 1.1.9
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ac9138..fb5293c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3280d47a16a29beef586d5b6068a562  libservicelog-1.0.1.tar.gz
+20f39a9b2ca24d8a95607e50d2d83cf7  libservicelog-1.1.9.tar.gz