SPECS: dhcpv6.spec - fix rc-scripts deps and install

[glen]

Author: glen                         Date: Sat Dec 15 18:23:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix rc-scripts deps and install

---- Files affected:
SPECS:
   dhcpv6.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/dhcpv6.spec
diff -u SPECS/dhcpv6.spec:1.27 SPECS/dhcpv6.spec:1.28
--- SPECS/dhcpv6.spec:1.27	Fri Dec 14 18:37:29 2007
+++ SPECS/dhcpv6.spec	Sat Dec 15 19:23:14 2007
@@ -1,13 +1,11 @@
 # $Revision$, $Date$
 # TODO:
-# - obsoletes when renaming a package
 # - subpackage for relay daemon
-# - use %%service
 Summary:	DHCPv6 - DHCP server and client for IPv6
 Summary(pl.UTF-8):	DHCPv6 - serwer i klient DHCP dla IPv6
 Name:		dhcpv6
 Version:	1.0.3
-Release:	0.9
+Release:	0.10
 Epoch:		1
 License:	GPL v2+
 Group:		Networking/Daemons
@@ -22,7 +20,9 @@
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,6 +47,7 @@
 Summary:	DHCPv6 client
 Summary(pl.UTF-8):	Klient DHCPv6
 Group:		Applications/Networking
+Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 
 %description -n dhcpv6-client
@@ -131,16 +132,26 @@
 
 %post
 /sbin/chkconfig --add dhcp6s
+%service dhcp6s restart
+/sbin/chkconfig --add dhcp6r
+%service dhcp6r restart
 
 %preun
 if [ "$1" = "0" ]; then
-	/etc/rc.d/init.d/dhcp6s stop >/dev/null 2>&1
+	%service dhcp6s stop
 	/sbin/chkconfig --del dhcp6s
+	%service dhcp6r stop
+	/sbin/chkconfig --del dhcp6r
 fi
 
-%postun
-if [ "$1" -ge "1" ]; then
-	/etc/rc.d/init.d/dhcp6s restart >/dev/null 2>&1
+%post -n dhcpv6-client
+/sbin/chkconfig --add dhcp6c
+%service dhcp6c restart
+
+%preun -n dhcpv6-client
+if [ "$1" = "0" ]; then
+	%service dhcp6c stop
+	/sbin/chkconfig --del dhcp6c
 fi
 
 %post	-n libdhcp6client -p /sbin/ldconfig
@@ -191,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2007-12-15 18:23:14  glen
+- fix rc-scripts deps and install
+
 Revision 1.27  2007-12-14 17:37:29  qboosh
 - BR: am,lt
 - use ldconfig
@@ -284,19 +298,3 @@
 Revision 1.1  2004/09/21 23:00:16  arekm
 - raw
 
-* Mon Sep 13 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-6
-- fix bug 132468 for bug 125712: invoke change_resolv_conf
-
-* Mon Sep 13 2004 Bill Nottingham <notting at redhat.com> - 0.10-5
-- don't run by default
-- add chkconfig prereqs, postun script, etc.
-
-* Thu Sep  2 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-3/4
-- fixed missing %defattr for dhcpv6_client - bug 131638
-
-* Mon Aug 30 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-2
-- Split into two packages: dhcpv6-*, containing server only,
-- and dhcpv6_client-*, containing client only.
-
-* Thu Aug 26 2004 Jason Vas Dias <jvdias at redhat.com> - 0.10-1
-- Initial build.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dhcpv6.spec?r1=1.27&r2=1.28&f=u