rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.23,1.24

[Enrico Scholz]

Author: ensc

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

Modified Files:
	dhcp-forwarder.spec 
Log Message:
updated


Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dhcp-forwarder.spec	24 Feb 2009 11:40:07 -0000	1.23
+++ dhcp-forwarder.spec	1 Mar 2009 12:09:39 -0000	1.24
@@ -22,7 +22,7 @@
 Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.8
-Release: %release_func 2
+Release: %release_func 3
 License:	GPLv3
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
@@ -32,13 +32,13 @@
 Requires:	init(dhcp-forwarder)
 BuildRequires:	which
 BuildRequires:	fedora-usermgmt-devel
-Provides:	user(%username)
-Provides:	group(%username)
+Provides:	user(%username) = 11
+Provides:	group(%username) = 11
 %{?FE_USERADD_REQ}
 
 %{?with_dietlibc:BuildRequires:	dietlibc}
 
-%package sysv
+%package sysvinit
 Summary:		SysV initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = sysv
@@ -47,7 +47,20 @@
 Requires(postun):	%name initscripts
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/chkconfig
+Provides:		%name-sysv = %version-%release
+Obsoletes:		%name-sysv < %version-%release
+BuildArch:		noarch
 
+%package upstart
+Summary:		upstart initscripts for dhcp-forwarder
+Group:			System Environment/Base
+Source10:		dhcp-forwarder.upstart
+Provides:		init(dhcp-forwarder) = upstart
+Requires:		%name = %version-%release
+# implicates a conflict with upstart 0.5+
+Requires(pre):		/etc/event.d	
+Requires:		upstart
+BuildArch:		noarch
 
 %package minit
 Summary:		minit initscripts for dhcp-forwarder
@@ -56,7 +69,7 @@
 Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
-
+BuildArch:		noarch
 
 
 %description
@@ -71,7 +84,7 @@
 * Has a small memory footprint when using dietlibc
 
 
-%description sysv
+%description sysvinit
 dhcp-fwd forwards DHCP messages between subnets with different sublayer
 broadcast domains.
 
@@ -79,6 +92,14 @@
 with the SysV initconcept.
 
 
+%description upstart
+dhcp-fwd forwards DHCP messages between subnets with different sublayer
+broadcast domains.
+
+This package provides the scripts which can be used to start dhcp-forwarder
+with the upstart initconcept.
+
+
 %description minit
 dhcp-fwd forwards DHCP messages between subnets with different sublayer
 broadcast domains.
@@ -104,17 +125,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %__make DESTDIR=$RPM_BUILD_ROOT install install-contrib
-%__install -d -m700 $RPM_BUILD_ROOT%homedir
+%__install -d  -m 0700 $RPM_BUILD_ROOT%homedir
+%__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/event.d/dhcp-forwarder
 
 %{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-
 %check
 %__make check
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -130,16 +150,16 @@
 %__fe_groupdel %username &>/dev/null || :
 
 
-%post sysv
+%post sysvinit
 /sbin/chkconfig --add %service
 
-%preun sysv
+%preun sysvinit
 if test "$1" = "0"; then
 	%_initrddir/%service stop >/dev/null
 	/sbin/chkconfig --del %service
 fi
 
-%postun sysv
+%postun sysvinit
 test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
@@ -156,12 +176,16 @@
 %homedir
 
 
-%files sysv
+%files sysvinit
 %defattr(-,root,root,-)
 %config %_initrddir/*
 %config(noreplace) %_sysconfdir/sysconfig/*
 
 
+%files upstart
+%defattr(-,root,root,-)
+%config(noreplace) /etc/event.d/*
+
 %if 0%{?with_minit:1}
 
 %files minit
@@ -175,6 +199,11 @@
 
 
 %changelog
+* Sun Mar  1 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-3
+- added -upstart subpackage
+- renamed -sysv subpackage to -sysvinit to make -upstart win the
+  default dependency resolving
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild