SPECS (AC-branch): cyrus-sasl.spec - add nagios config to SOURCES

[glen]

Author: glen                         Date: Tue Feb  3 13:49:36 2009 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add nagios config to SOURCES

---- Files affected:
SPECS:
   cyrus-sasl.spec (1.162.2.8 -> 1.162.2.9) 

---- Diffs:

================================================================
Index: SPECS/cyrus-sasl.spec
diff -u SPECS/cyrus-sasl.spec:1.162.2.8 SPECS/cyrus-sasl.spec:1.162.2.9
--- SPECS/cyrus-sasl.spec:1.162.2.8	Fri Jan 30 17:59:03 2009
+++ SPECS/cyrus-sasl.spec	Tue Feb  3 14:49:30 2009
@@ -26,7 +26,7 @@
 Summary(uk.UTF-8):	Бібліотека Cyrus SASL
 Name:		cyrus-sasl
 Version:	2.1.22
-Release:	8.3
+Release:	8.4
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@
 Source1:	saslauthd.init
 Source2:	saslauthd.sysconfig
 Source3:	%{name}.pam
+Source4:	check_saslauthd.cfg
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-lt.patch
 Patch2:		%{name}-split-sql.patch
@@ -528,7 +529,7 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/saslauthd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install %{SOURCE3} ./cyrus.pam
+install %{SOURCE3} cyrus.pam
 
 install saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
 
@@ -540,16 +541,7 @@
 touch $RPM_BUILD_ROOT/var/lib/sasl2/{cache.flock,cache.mmap,mux,mux.accept,saslauthd.pid}
 
 install -d $RPM_BUILD_ROOT/etc/nagios/plugins
-cat > $RPM_BUILD_ROOT/etc/nagios/plugins/check_saslauthd.cfg <<'EOF'
-# Commandline Usage:
-#   check_saslauthd -u username -p password [-r realm] [-s servicename] [-f socket path] [-R repeatnum]
-# Plugin Usage:
-#   check_saslauthd!username!password![-r realm] [-s servicename] [-f socket path] [-R repeatnum]
-define command {
-	command_name    check_saslauthd
-	command_line    %{_libdir}/nagios/plugins/check_saslauthd -u $ARG1$ -p $ARG2$ $ARG3$
-}
-EOF
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/nagios/plugins/check_saslauthd.cfg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -703,6 +695,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162.2.9  2009/02/03 13:49:30  glen
+- add nagios config to SOURCES
+
 Revision 1.162.2.8  2009/01/30 16:59:03  glen
 - add nagios-plugin-check_saslauthd package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cyrus-sasl.spec?r1=1.162.2.8&r2=1.162.2.9&f=u