rpms/dhcp-forwarder/devel dhcp-forwarder.upstart, 1.2, 1.3 dhcp-forwarder.spec, 1.27, 1.28

[ensc]

Author: ensc

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20895

Modified Files:
	dhcp-forwarder.upstart dhcp-forwarder.spec 
Log Message:
updated -upstart to upstart 0.6.3



Index: dhcp-forwarder.upstart
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.upstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dhcp-forwarder.upstart	22 Nov 2009 10:44:10 -0000	1.2
+++ dhcp-forwarder.upstart	6 Dec 2009 11:13:49 -0000	1.3
@@ -1,9 +1,9 @@
-### Uncomment the 'start' lines below
+### Uncomment *one* of the 'start' lines 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/dhcp-fwd -n -c /etc/dhcp-fwd.conf


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- dhcp-forwarder.spec	6 Dec 2009 11:12:45 -0000	1.27
+++ dhcp-forwarder.spec	6 Dec 2009 11:13:49 -0000	1.28
@@ -22,7 +22,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.8
-Release:	%release_func 5
+Release:	%release_func 1300
 License:	GPLv3
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -57,8 +57,7 @@ Group:			System Environment/Base
 Source10:		dhcp-forwarder.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
@@ -127,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
 %__install -d  -m 0700 $RPM_BUILD_ROOT%homedir
-%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/dhcp-forwarder
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/dhcp-forwarder.conf
 
 %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
@@ -192,7 +191,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}
@@ -208,6 +207,9 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-1300
+- updated -upstart to upstart 0.6.3
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild