rpms/ip-sentinel/devel ip-sentinel.upstart, 1.2, 1.3 ip-sentinel.spec, 1.19, 1.20

[ensc]

Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19739

Modified Files:
	ip-sentinel.upstart ip-sentinel.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: ip-sentinel.upstart
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ip-sentinel.upstart	22 Nov 2009 10:43:09 -0000	1.2
+++ ip-sentinel.upstart	6 Dec 2009 11:10:44 -0000	1.3
@@ -1,12 +1,12 @@
 # NOTE: you will have to create an 'ips.cfg' file in ~ip-sentinel/
 # before service can be enabled
 
-### Uncomment the 'start' lines below
+### Uncomment *one* 'start' line below
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/ip-sentinel -u ip-sentinel -g ip-sentinel -n eth0


Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ip-sentinel.spec	6 Dec 2009 10:53:13 -0000	1.19
+++ ip-sentinel.spec	6 Dec 2009 11:10:44 -0000	1.20
@@ -41,7 +41,7 @@
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.12
-Release:	%release_func 15
+Release:	%release_func 1300
 License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/ip-sentinel/
@@ -78,8 +78,7 @@ Group:			System Environment/Base
 Source10:		ip-sentinel.upstart
 Provides:		init(%name) = upstart
 Requires:		%name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 BuildArch:		noarch
@@ -143,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
 %__install -m750 -d $RPM_BUILD_ROOT%homedir
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/ip-sentinel
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/ip-sentinel.conf
 
 %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
@@ -203,7 +202,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 %files upstart
 %defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 
 
 %if 0%{?with_minit:1}
@@ -219,6 +218,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-1300
+- updated -upstart to upstart 0.6.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild