SPECS (AC-branch): nessus-core.spec - use %service

[glen]

Author: glen                         Date: Mon Mar  5 00:17:26 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service

---- Files affected:
SPECS:
   nessus-core.spec (1.28.2.1 -> 1.28.2.2) 

---- Diffs:

================================================================
Index: SPECS/nessus-core.spec
diff -u SPECS/nessus-core.spec:1.28.2.1 SPECS/nessus-core.spec:1.28.2.2
--- SPECS/nessus-core.spec:1.28.2.1	Mon Mar  5 01:06:48 2007
+++ SPECS/nessus-core.spec	Mon Mar  5 01:17:21 2007
@@ -5,7 +5,7 @@
 Summary(pl):	Główny pakiet Nessusa
 Name:		nessus-core
 Version:	2.2.4
-Release:	2
+Release:	3
 License:	GPL
 Group:		Networking
 Source0:	ftp://ftp.nessus.org/pub/nessus/nessus-%{version}/src/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@
 BuildRequires:	libtool
 BuildRequires:	nessus-libs-devel >= %{version}
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # keep in sync with nessus-libs!
@@ -45,8 +46,10 @@
 Summary:	Nessus daemon
 Summary(pl):	Demon Nessusa
 Group:		Networking
+Requires(post,preun):	/sbin/chkconfig
 Requires:	libnasl >= %{version}
 Requires:	nessus-libs >= %{version}
+Requires:	rc-scripts
 
 %description -n nessusd
 The "Nessus" Project aims to provide to the Internet community a free,
@@ -150,15 +153,16 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n nessusd
-echo "Run \"/sbin/chkconfig --add nessusd\" to activate nessus daemon."
-echo "then run \"/etc/rc.d/init.d/nessusd start\" to start nessus daemon."
-echo "don't forget about /etc/nessus/nessusd.conf file!"
+/sbin/chkconfig --add nessusd
+%service nessusd restart "nessus daemon"
+if [ "$1" = 1 ]; then
+	echo "Don't forget about %{_sysconfdir}/nessus/nessusd.conf file!"
+	echo "Note that if you don't have a nessusd.conf file, nessusd will create one for you!"
+fi
 
 %preun -n nessusd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/nessusd ]; then
-		/etc/rc.d/init.d/nessusd stop >&2
-	fi
+	%service nessusd stop
 	/sbin/chkconfig --del nessusd
 fi
 
@@ -194,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28.2.2  2007/03/05 00:17:21  glen
+- use %service
+
 Revision 1.28.2.1  2007/03/05 00:06:48  glen
 - missing dir; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nessus-core.spec?r1=1.28.2.1&r2=1.28.2.2&f=u