packages: nagios-pnp/nagios-pnp.spec - 0.6.7 tarball

[glen]

Author: glen                         Date: Fri Dec 24 17:07:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.6.7 tarball

---- Files affected:
packages/nagios-pnp:
   nagios-pnp.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/nagios-pnp/nagios-pnp.spec
diff -u packages/nagios-pnp/nagios-pnp.spec:1.5 packages/nagios-pnp/nagios-pnp.spec:1.6
--- packages/nagios-pnp/nagios-pnp.spec:1.5	Thu Aug 13 17:48:07 2009
+++ packages/nagios-pnp/nagios-pnp.spec	Fri Dec 24 18:07:53 2010
@@ -1,13 +1,13 @@
 # $Revision$, $Date$
 Summary:	Nagios performance data analysis tool
 Name:		nagios-pnp
-Version:	0.4.14
-Release:	0.2
+Version:	0.6.7
+Release:	0.1
 License:	GPL v2
 Group:		Applications/System
 URL:		http://www.pnp4nagios.org/pnp/start
-Source0:	http://dl.sourceforge.net/pnp4nagios/pnp-%{version}.tar.gz
-# Source0-md5:	9dbbf08191a258f6798c9516b3821ff0
+Source0:	http://downloads.sourceforge.net/pnp4nagios/pnp4nagios-%{version}.tar.gz
+# Source0-md5:	d3da00c9df9123a28da0b9cd3f910c07
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 BuildRequires:	perl-Time-HiRes
@@ -27,8 +27,8 @@
 plugins and stores them automatically into RRD-databases.
 
 %prep
-%setup -q -n pnp-%{version}
-%{__sed} -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' configure
+%setup -q -n pnp4nagios-%{version}
+#%{__sed} -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' configure
 
 %build
 %configure \
@@ -39,21 +39,34 @@
 	--datadir=%{_datadir}/nagios/pnp \
 	--datarootdir=%{_datadir}/nagios/pnp \
 	--with-perfdata-dir=%{_localstatedir}/lib/pnp \
-	--with-perfdata-spool-dir=%{_localstatedir}/spool/pnp
+	--with-perfdata-spool-dir=%{_localstatedir}/spool/pnp \
+	--with-layout=default \
+	--with-nagios-user=nagios \
+	--with-nagios-group=nagios \
+	--with-rrdtool=/usr/bin/rrdtool \
+	--with-perfdata-logfile=/var/log/pnp \
+	--with-httpd-conf=/etc/webapps/pnp \
+	--with-base-url=/pnp \
+	--with-init-dir=/etc/rc.d/init.d \
+
+#  --without-kohana does not install the kohana framework
+#  --with-kohana_system=<existing kohana system dir> Points to an already installed kohana framework
+
+
 
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/webapps/pnp
+%{__make} fullinstall \
+	INSTALL_OPTS= \
+	INIT_OPTS= \
 	STRIP=: \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install-config \
-	DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT%{_sysconfdir}/pnp -name *-sample -exec rename "-sample" "" {} ';'
-sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp/process_perfdata.pl|' \
+find $RPM_BUILD_ROOT%{_sysconfdir}/pnp -name *-sample -exec rename '-sample' '' {} ';'
+sed -i \
        -e 's|^log_type = syslog|log_type = file|' \
        $RPM_BUILD_ROOT%{_sysconfdir}/pnp/npcd.cfg
 
@@ -81,8 +94,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README
-%doc README.npcd THANKS TODO
+%doc AUTHORS ChangeLog COPYING INSTALL README THANKS
 %dir %{_sysconfdir}/pnp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pnp/*
 %attr(754,root,root) /etc/rc.d/init.d/npcd
@@ -91,17 +103,26 @@
 %dir %{_libdir}/pnp
 %attr(755,root,root) %{_libdir}/pnp/check_pnp_rrds.pl
 %attr(755,root,root) %{_libdir}/pnp/process_perfdata.pl
+%attr(755,root,root) %{_libdir}/pnp/rrd_convert.pl
+%attr(755,root,root) %{_libdir}/pnp/verify_pnp_config.pl
 %attr(755,nagios,nagios) %{_localstatedir}/lib/pnp
 %attr(755,nagios,nagios) %{_localstatedir}/log/pnp
 %attr(755,nagios,nagios) %{_localstatedir}/spool/pnp
 %{_datadir}/nagios/pnp
 
+%{_sysconfdir}/webapps/pnp/pnp4nagios.conf
+# TODO: use system pkg
+%{_libdir}/kohana
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/12/24 17:07:53  glen
+- 0.6.7 tarball
+
 Revision 1.5  2009/08/13 15:48:07  glen
 - fix --datadir and --dataroot dir to reflect nagios3 directory layout
 - fix path to config file in init script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-pnp/nagios-pnp.spec?r1=1.5&r2=1.6&f=u