SPECS: nagios-nsca.spec - update to 2.6 - use %service

[glen]

Author: glen                         Date: Sun May 21 19:38:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 2.6
- use %service

---- Files affected:
SPECS:
   nagios-nsca.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/nagios-nsca.spec
diff -u SPECS/nagios-nsca.spec:1.4 SPECS/nagios-nsca.spec:1.5
--- SPECS/nagios-nsca.spec:1.4	Tue Dec 13 14:58:51 2005
+++ SPECS/nagios-nsca.spec	Sun May 21 21:38:44 2006
@@ -6,12 +6,12 @@
 Summary:	NSCA daemon for Nagios
 Summary(pl):	Demon NSCA dla Nagiosa
 Name:		nagios-nsca
-Version:	2.4
-Release:	2
+Version:	2.6
+Release:	1
 License:	GPL
 Group:		Networking
-Source0:	ftp://distfiles.pld-linux.org/src/nsca-%{version}.tar.gz
-# Source0-md5:	ab58553a87940f574ec54189a43a70bc
+Source0:	http://dl.sourceforge.net/nagios/nsca-%{version}.tar.gz
+# Source0-md5:	d526a3ac3c29648c729c5fb4fb332488
 Source1:	%{name}.init
 Source2:	%{name}.submit
 Patch0:		%{name}-groups.patch
@@ -19,11 +19,15 @@
 BuildRequires:	autoconf
 BuildRequires:	libltdl-devel
 %{?with_mcrypt:BuildRequires:	libmcrypt-devel}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	nagios
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_localstatedir	/var/lib/nagios
+%define		_sysconfdir		/etc/nagios
+
 %description
 NSCA daemon for Nagios - listens for service check results from remote
 machines (sent using send_ncsa from nagios-ncsa-client package).
@@ -57,16 +61,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/nagios,/etc/rc.d/init.d} \
-	$RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,%{_sbindir}}
 
-install src/nsca $RPM_BUILD_ROOT%{_sbindir}
-sed -e 's@^command_file=.*@command_file=/var/lib/nagios/rw/nagios.cmd@;s@^alternate_dump_file=.*@alternate_dump_file=/var/lib/nagios/rw/nsca.dump@' \
-	nsca.cfg > $RPM_BUILD_ROOT%{_sysconfdir}/nagios/nsca.cfg
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nagios-nsca
-
+install src/nsca $RPM_BUILD_ROOT%{_sbindir}
 install src/send_nsca $RPM_BUILD_ROOT%{_sbindir}
-install send_nsca.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+
+install sample-config/nsca.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nsca.cfg
+install sample-config/send_nsca.cfg $RPM_BUILD_ROOT%{_sysconfdir}/send_nsca.cfg
+
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/send_nsca-submit
 echo '# put your central nagios machine name or address here' > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/send_nsca-central
@@ -76,24 +79,18 @@
 
 %post
 /sbin/chkconfig --add nagios-nsca
-if [ -f /var/lock/subsys/nagios-nsca ]; then
-	/etc/rc.d/init.d/nagios-nsca restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/nagios-nsca start\" to start NSCA daemon." >&2
-fi
+%service nagios-nsca restart "NSCA daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/nagios-nsca ]; then
-		/etc/rc.d/init.d/nagios-nsca stop >&2
-	fi
+	%service nagios-nsca stop
 	/sbin/chkconfig --del nagios-nsca
 fi
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nagios/nsca.cfg
 %doc Changelog README SECURITY
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nsca.cfg
 %attr(755,root,root) %{_sbindir}/nsca
 %attr(754,root,root) /etc/rc.d/init.d/nagios-nsca
 
@@ -109,11 +106,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/05/21 19:38:44  glen
+- update to 2.6
+- use %service
+
 Revision 1.4  2005/12/13 13:58:51  glen
 - adapterized (sorted %verify attrs)
 
 Revision 1.3  2005/08/09 13:39:57  havner
-- moved daemon binary do %%sbindir
+- moved daemon binary do %sbindir
 - groups patch
 - rel 2
 
@@ -122,4 +123,3 @@
 
 Revision 1.1  2005/08/08 12:42:44  havner
 - nsca 2.4 for nagios (based on netsaint-nsca.spec - is it to be removed?)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-nsca.spec?r1=1.4&r2=1.5&f=u