rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.24,1.25
Enrico Scholz
ensc at fedoraproject.org
Sun Mar 1 13:39:40 UTC 2009
- Previous message: rpms/wastesedge/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wastesedge.spec, 1.5, 1.6
- Next message: rpms/nemiver/devel .cvsignore, 1.12, 1.13 nemiver.spec, 1.20, 1.21 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ensc
Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30603
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dhcp-forwarder.spec 1 Mar 2009 12:09:39 -0000 1.24
+++ dhcp-forwarder.spec 1 Mar 2009 13:39:09 -0000 1.25
@@ -22,14 +22,14 @@
Summary: DHCP relay agent
Name: dhcp-forwarder
Version: 0.8
-Release: %release_func 3
+Release: %release_func 4
License: GPLv3
Group: System Environment/Daemons
URL: http://www.tu-chemnitz.de/~ensc/dhcp-fwd
Source0: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
Source1: http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
BuildRoot: %_tmppath/%name-%version-%release-root
-Requires: init(dhcp-forwarder)
+Requires: init(%name)
BuildRequires: which
BuildRequires: fedora-usermgmt-devel
Provides: user(%username) = 11
@@ -41,7 +41,7 @@
%package sysvinit
Summary: SysV initscripts for dhcp-forwarder
Group: System Environment/Base
-Provides: init(dhcp-forwarder) = sysv
+Provides: init(%name) = sysv
Requires: %name = %version-%release
Requires(preun): %name initscripts
Requires(postun): %name initscripts
@@ -55,17 +55,18 @@
Summary: upstart initscripts for dhcp-forwarder
Group: System Environment/Base
Source10: dhcp-forwarder.upstart
-Provides: init(dhcp-forwarder) = upstart
+Provides: init(%name) = upstart
Requires: %name = %version-%release
# implicates a conflict with upstart 0.5+
Requires(pre): /etc/event.d
-Requires: upstart
+Requires(post): /usr/bin/killall
+Requires(postun): /sbin/initctl
BuildArch: noarch
%package minit
Summary: minit initscripts for dhcp-forwarder
Group: System Environment/Base
-Provides: init(dhcp-forwarder) = minit
+Provides: init(%name) = minit
Requires: %name = %version-%release
Requires(pre): minit-setup
Requires(postun): minit-setup
@@ -163,6 +164,13 @@
test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
+%post upstart
+/usr/bin/killall -u %username dhcp-fwd 2>/dev/null || :
+
+%preun upstart
+test "$1" != "0" || /sbin/initctl -q stop dhcp-forwarder || :
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -186,6 +194,7 @@
%defattr(-,root,root,-)
%config(noreplace) /etc/event.d/*
+
%if 0%{?with_minit:1}
%files minit
@@ -199,6 +208,9 @@
%changelog
+* Sun Mar 1 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-4
+- added upstart %%scriplets
+
* 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
- Previous message: rpms/wastesedge/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wastesedge.spec, 1.5, 1.6
- Next message: rpms/nemiver/devel .cvsignore, 1.12, 1.13 nemiver.spec, 1.20, 1.21 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list