SPECS (AC-branch): quagga.spec - use %service, rel 3

[glen]

Author: glen                         Date: Sat Apr 15 14:08:41 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service, rel 3

---- Files affected:
SPECS:
   quagga.spec (1.25.2.5 -> 1.25.2.6) 

---- Diffs:

================================================================
Index: SPECS/quagga.spec
diff -u SPECS/quagga.spec:1.25.2.5 SPECS/quagga.spec:1.25.2.6
--- SPECS/quagga.spec:1.25.2.5	Sat Apr 15 16:02:46 2006
+++ SPECS/quagga.spec	Sat Apr 15 16:08:36 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Zestaw oprogramowania do routingu
 Name:		quagga
 Version:	0.98.5
-Release:	2
+Release:	3
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -209,7 +209,7 @@
 	--enable-group=quagga \
 	--enable-vty-group=quaggavty \
 	--enable-rtadv \
-        --disable-watchquagga \
+	--disable-watchquagga \
 	--with-libpam
 
 %{__make}
@@ -267,112 +267,76 @@
 if [ ! -s %{_sysconfdir}/zebra.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/zebra.conf
 fi
-if [ -f /var/lock/subsys/zebra ]; then
-	/etc/rc.d/init.d/zebra restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/zebra start' to start main routing deamon." >&2
-fi
+%service zebra restart "main routing daemon"
 
 %post bgpd
 /sbin/chkconfig --add bgpd >&2
 if [ ! -s %{_sysconfdir}/bgpd.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/bgpd.conf
 fi
-if [ -f /var/lock/subsys/bgpd ]; then
-	/etc/rc.d/init.d/bgpd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/bgpd start' to start bgpd routing deamon." >&2
-fi
+%service bgpd restart "bgpd routing daemon"
 
 %post ospfd
 /sbin/chkconfig --add ospfd >&2
 if [ ! -s %{_sysconfdir}/ospfd.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/ospfd.conf
 fi
-if [ -f /var/lock/subsys/ospfd ]; then
-	/etc/rc.d/init.d/ospfd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ospfd start' to start ospfd routing deamon." >&2
-fi
+%service ospfd restart "ospfd routing daemon"
 
 %post ospf6d
 /sbin/chkconfig --add ospf6d >&2
 if [ ! -s %{_sysconfdir}/ospf6d.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/ospf6d.conf
 fi
-if [ -f /var/lock/subsys/ospf6d ]; then
-	/etc/rc.d/init.d/ospf6d restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ospf6d start' to start ospf6d routing deamon." >&2
-fi
+%service ospf6d restart "ospf6d routing daemon"
 
 %post ripd
 /sbin/chkconfig --add ripd >&2
 if [ ! -s %{_sysconfdir}/ripd.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/ripd.conf
 fi
-if [ -f /var/lock/subsys/ripd ]; then
-	/etc/rc.d/init.d/ripd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ripd start' to start ripd routing deamon." >&2
-fi
+%service ripd restart "ripd routing daemon"
 
 %post ripngd
 /sbin/chkconfig --add ripngd >&2
 if [ ! -s %{_sysconfdir}/ripngd.conf ]; then
 	echo "hostname `hostname`" > %{_sysconfdir}/ripngd.conf
 fi
-if [ -f /var/lock/subsys/ripngd ]; then
-	/etc/rc.d/init.d/ripngd restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/ripngd start' to start ripngd routing deamon." >&2
-fi
+%service ripngd restart "ripngd routing daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/zebra ]; then
-		/etc/rc.d/init.d/zebra stop >&2
-	fi
+	%service zebra stop
 	/sbin/chkconfig --del zebra >&2
 fi
 
 %preun bgpd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/bgpd ]; then
-		/etc/rc.d/init.d/bgpd stop >&2
-	fi
+	%service bgpd stop
 	/sbin/chkconfig --del bgpd >&2
 fi
 
 %preun ospfd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ospfd ]; then
-		/etc/rc.d/init.d/ospfd stop >&2
-	fi
+	%service ospfd stop
 	/sbin/chkconfig --del ospfd >&2
 fi
 
 %preun ospf6d
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ospf6d ]; then
-		/etc/rc.d/init.d/ospf6d stop >&2
-	fi
+	%service ospf6d stop
 	/sbin/chkconfig --del ospf6d >&2
 fi
 
 %preun ripd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ripd ]; then
-		/etc/rc.d/init.d/ripd stop >&2
-	fi
+	%service ripd stop
 	/sbin/chkconfig --del ripd >&2
 fi
 
 %preun ripngd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ripngd ]; then
-		/etc/rc.d/init.d/ripngd stop >&2
-	fi
+	%service ripngd stop
 	/sbin/chkconfig --del ripngd >&2
 fi
 
@@ -478,6 +442,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.6  2006/04/15 14:08:36  glen
+- use %service, rel 3
+
 Revision 1.25.2.5  2006/04/15 14:02:46  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quagga.spec?r1=1.25.2.5&r2=1.25.2.6&f=u