From a02dd73345b988fff0fbe94f48e3dccc6502948c Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: Aug 27 2008 15:41:53 +0000
Subject: change init.d patch to just be a source file


---

diff --git a/prelude-lml-initd.patch b/prelude-lml-initd.patch
deleted file mode 100644
index 1c257ce..0000000
--- a/prelude-lml-initd.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- prelude-lml-initd.new	2007-01-05 19:07:45.000000000 +0100
-+++ prelude-lml-initd	2007-01-05 19:30:58.000000000 +0100
-@@ -0,0 +1,74 @@
-+#!/bin/sh
-+#
-+# prelude lml	The prelude log analyzer    
-+#
-+# chkconfig: - 80 10
-+# description: The prelude log analyzer
-+#              when using postgresql : - 87 13
-+#                         mysql      : - 80 10
-+
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+# Source networking configuration.
-+. /etc/sysconfig/network
-+
-+# Check that networking is up.
-+[ ${NETWORKING} = "no" ] && exit 0
-+
-+prog=prelude-lml
-+progpath=/usr/bin/$prog
-+pidfile=/var/run/${prog}.pid
-+
-+[ -x $progpath ]        || exit 0
-+[ -d /etc/$prog ]       || exit 0
-+
-+RETVAL=0
-+
-+start() {
-+	# Start daemon.
-+	echo -n "Starting $prog: "
-+        daemon $NICELEVEL $progpath -d -P $pidfile 
-+	RETVAL=$?
-+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-+        echo
-+	return $RETVAL	
-+}
-+
-+stop() {
-+        # Stop daemons
-+        echo -n "Shutting down $prog: "
-+        killproc $prog
-+        RETVAL=$?
-+        echo
-+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog $pidfile
-+	return $RETVAL
-+}
-+
-+restart() {
-+	stop
-+	start
-+}
-+
-+case "$1" in
-+    start)
-+	start
-+	;;
-+    stop)
-+	stop
-+	;;
-+    restart|reload)
-+	stop
-+	start
-+	;;
-+    status)
-+	status $prog 
-+	RETVAL=$?
-+	;;
-+    *)
-+	echo "Usage: $0 {start|stop|restart|reload|status}"
-+	exit 1
-+esac
-+
-+exit $?
diff --git a/prelude-lml.init b/prelude-lml.init
new file mode 100644
index 0000000..fbd4e48
--- /dev/null
+++ b/prelude-lml.init
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# prelude lml	The prelude log analyzer    
+#
+# chkconfig: - 80 10
+# description: The prelude log analyzer
+#              when using postgresql : - 87 13
+#                         mysql      : - 80 10
+
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+prog=prelude-lml
+progpath=/usr/bin/$prog
+pidfile=/var/run/${prog}.pid
+
+[ -x $progpath ]        || exit 0
+[ -d /etc/$prog ]       || exit 0
+
+RETVAL=0
+
+start() {
+	# Start daemon.
+	echo -n "Starting $prog: "
+        daemon $NICELEVEL $progpath -d -P $pidfile 
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+        echo
+	return $RETVAL	
+}
+
+stop() {
+        # Stop daemons
+        echo -n "Shutting down $prog: "
+        killproc $prog
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog $pidfile
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+    start)
+	start
+	;;
+    stop)
+	stop
+	;;
+    restart|reload)
+	stop
+	start
+	;;
+    status)
+	status $prog 
+	RETVAL=$?
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload|status}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/prelude-lml.spec b/prelude-lml.spec
index 86c7443..6be2851 100644
--- a/prelude-lml.spec
+++ b/prelude-lml.spec
@@ -6,9 +6,9 @@ Summary:	The prelude log analyzer
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://prelude-ids.org/
-Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz	
-Patch1:		%{name}-initd.patch
-Patch2:		prelude-lml-0.9.12-pie.patch
+Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
+Source1:        prelude-lml.init
+Patch1:		prelude-lml-0.9.12-pie.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gamin-devel, libprelude-devel, pcre-devel  
@@ -43,8 +43,7 @@ sensor.
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p1
+%patch1 -p1
 sed -i.debug -e '/nlist/s|\$rm|: $rm|' ltmain.sh
 
 
@@ -65,7 +64,7 @@ mkdir -p %{buildroot}/%{_initrddir}/
 mkdir -p %{buildroot}/var/lib/%{name}/
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 cp -p  AUTHORS README ChangeLog NEWS COPYING HACKING.README %{buildroot}%{_defaultdocdir}/%{name}-%{version}  
-install -m 755 %{name}-initd %{buildroot}/%{_initrddir}/%{name}
+install -m 755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 rm -f %{buildroot}/%{_libdir}/%{name}/debug.la
 rm -f %{buildroot}/%{_libdir}/%{name}/pcre.la