SPECS: nessus-core.spec - fix chkconfig deps, use %service

[glen]

Author: glen                         Date: Thu Apr 20 17:06:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix chkconfig deps, use %service

---- Files affected:
SPECS:
   nessus-core.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/nessus-core.spec
diff -u SPECS/nessus-core.spec:1.32 SPECS/nessus-core.spec:1.33
--- SPECS/nessus-core.spec:1.32	Mon Mar 27 02:50:47 2006
+++ SPECS/nessus-core.spec	Thu Apr 20 19:06:22 2006
@@ -21,6 +21,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!
@@ -47,8 +48,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,
@@ -122,11 +125,11 @@
 %{__autoconf}
 %configure \
 	--enable-gtk
-#--enable-syslog         log messages via syslog()
-#--enable-tcpwrappers    use the libwrap.a library
-#--enable-unix-socket=/path    use a unix socket for client server communication
-#--enable-release        set the compiler flags to -O
-#--with-x                use the X Window System
+#--enable-syslog		 log messages via syslog()
+#--enable-tcpwrappers	use the libwrap.a library
+#--enable-unix-socket=/path	use a unix socket for client server communication
+#--enable-release		set the compiler flags to -O
+#--with-x				use the X Window System
 
 %{__make}
 
@@ -158,16 +161,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!"
-echo "Note that if you don't have a nessusd.conf file, nessusd will create one for you!"
+/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
 
@@ -203,6 +206,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/04/20 17:06:22  glen
+- fix chkconfig deps, use %service
+
 Revision 1.32  2006/03/27 00:50:47  wolvverine
 - add lost file
 
================================================================

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