SPECS: nagios-nrpe.spec - don't own plugins dir - cleanup %configu...

[glen]

Author: glen                         Date: Sat Nov  5 02:07:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't own plugins dir
- cleanup %configure
- adapterized
- rel 5

---- Files affected:
SPECS:
   nagios-nrpe.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/nagios-nrpe.spec
diff -u SPECS/nagios-nrpe.spec:1.19 SPECS/nagios-nrpe.spec:1.20
--- SPECS/nagios-nrpe.spec:1.19	Tue Aug  9 15:43:04 2005
+++ SPECS/nagios-nrpe.spec	Sat Nov  5 03:07:01 2005
@@ -3,7 +3,7 @@
 Summary(pl):	Demon i wtyczka zdalnego wywoływania wtyczek Nagios
 Name:		nagios-nrpe
 Version:	2.0
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/nrpe-%{version}.tar.gz
@@ -12,11 +12,12 @@
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	openssl-tools
+BuildRequires:	rpmbuild(macros) >= 1.202
 Requires(post,postun):	/sbin/chkconfig
 Requires:	nagios-common
 Requires:	nagios-plugins
+Requires:	rc-scripts
 Provides:	nagios-core
 Obsoletes:	netsaint-nrpe
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -28,12 +29,12 @@
 %define		nsport		5666
 
 %description
-Nagios nrpe allows you to remotely execute plugins on other hosts
-and report the plugin output back to the monitoring host.
+Nagios nrpe allows you to remotely execute plugins on other hosts and
+report the plugin output back to the monitoring host.
 
 %description -l pl
-Nagios npre pozwala zdalnie uruchamiać wtyczki na innych hostach,
-a wynik ich działania zwracać z powrotem do hosta monitorującego.
+Nagios npre pozwala zdalnie uruchamiać wtyczki na innych hostach, a
+wynik ich działania zwracać z powrotem do hosta monitorującego.
 
 %package plugin
 Summary:	check_nrpe plugin for Nagios
@@ -46,8 +47,8 @@
 remote machines using nrpe service.
 
 %description plugin -l pl
-Wtyczka check_nrpe dla Nagiosa. Pozwala na zdalne uruchamianie
-wtyczek na innych komputerach za pomocą demona nrpe.
+Wtyczka check_nrpe dla Nagiosa. Pozwala na zdalne uruchamianie wtyczek
+na innych komputerach za pomocą demona nrpe.
 
 %prep
 %setup -q -n nrpe-%{version}
@@ -57,17 +58,11 @@
 %{__autoconf}
 
 %configure \
+	--libexecdir=%{_plugindir} \
 	--with-init-dir=/etc/rc.d/init.d \
 	--with-nrpe-port=%{nsport} \
 	--with-nrpe-user=nagios \
 	--with-nrpe-grp=nagios \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_sbindir} \
-	--bindir=%{_sbindir} \
-	--libexecdir=%{_plugindir} \
-	--datadir=%{_prefix}/share/nagios \
-	--sysconfdir=%{_sysconfdir} \
-	--localstatedir=%{_localstatedir} 
 
 %{__make} all
 
@@ -76,7 +71,7 @@
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir},%{_libdir}/nagios/plugins,%{_sbindir}} \
 	$RPM_BUILD_ROOT%{_localstatedir}
 
-install nrpe.cfg $RPM_BUILD_ROOT/etc/nagios/nrpe.cfg
+install nrpe.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nrpe.cfg
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nrpe
 install src/nrpe $RPM_BUILD_ROOT%{_sbindir}
 install src/check_nrpe $RPM_BUILD_ROOT%{_plugindir}
@@ -102,12 +97,11 @@
 %defattr(644,root,root,755)
 %doc Changelog LEGAL README* SECURITY
 %attr(754,root,root) /etc/rc.d/init.d/nrpe
-%attr(640,root,nagios) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/nrpe.cfg
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.cfg
 %attr(755,root,root) %{_sbindir}/nrpe
 
 %files plugin
 %defattr(644,root,root,755)
-%dir %{_plugindir}
 %attr(755,root,root) %{_plugindir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -116,6 +110,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/11/05 02:07:01  glen
+- don't own plugins dir
+- cleanup %configure
+- adapterized
+- rel 5
+
 Revision 1.19  2005/08/09 13:43:04  havner
 - rel 4 for fixed init file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-nrpe.spec?r1=1.19&r2=1.20&f=u