From 0398f61687c7a8053bc420f7dad24202d0fd6455 Mon Sep 17 00:00:00 2001
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Nov 21 2011 10:57:50 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/.gitignore b/.gitignore
index edba453..112727c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pnp-0.4.14.tar.gz
 /pnp4nagios-0.6.1.tar.gz
+/pnp4nagios-0.6.15.tar.gz
diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 74dd296..9c3d864 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
-Version:        0.6.1
-Release:        3%{?dist}
+Version:        0.6.15
+Release:        1%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
@@ -10,9 +10,6 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:        pnp4nagios.logrotate.conf
 Source2:        pnp4nagios-npcd.sysvinit
 Source3:        pnp4nagios-README.fedora
-Patch1:         pnp4nagios-0.4.14-change_broker_install_location.patch
-Patch2:         pnp4nagios-0.4.14-verify_pnp_config.in_rev654.patch
-Patch3:         pnp4nagios-php53.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  rrdtool-perl
@@ -24,7 +21,9 @@ Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-
+%if 0%{?fedora}
+Requires:       php-Kohana
+%endif
 
 %description
 PNP is an addon to nagios which analyzes performance data provided by plugins
@@ -34,15 +33,6 @@ and stores them automatically into RRD-databases.
 %prep
 %setup -q
 
-# Move broker to a better location
-#%patch1 -p0
-
-# Update verify_pnp_config script for bugfixes
-#%patch2 -p1
-
-# Fix PHP deprecated warnings with php 5.3
-#%patch3 -p0
-
 # Fix file encoding and end of line
 pushd contrib
 #iconv -f iso8859-1 -t utf-8 verify_pnp_config.txt > verify_pnp_config.txt.utf8
@@ -68,30 +58,36 @@ sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in
            --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/
 make %{?_smp_mflags} all
 
-# Remove unwanted file from the contrib directory
-#rm contrib/verify_pnp_config.in 
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 make install-config DESTDIR=$RPM_BUILD_ROOT 
 # remove -sample from filename suffix
-for i in $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/*-sample; do
+for i in $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/*-sample \
+         $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/*/*-sample
+do
   mv ${i} ${i%%-sample}
 done
-#sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \
-#       -e 's|^log_type = syslog|log_type = file|' \
-#       $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg
+rm -f $RPM_BUILD_ROOT%{_datadir}/nagios/html/pnp4nagios/install.php
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php.*
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config_local.php
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios
 install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+sed 's|/usr/local/nagios/etc/htpasswd.users|/etc/nagios/passwd|' \
+   sample-config/httpd.conf \
+   > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/nagios/brokers
-mv $RPM_BUILD_ROOT%{_sbindir}/npcdmod.o \
+mv $RPM_BUILD_ROOT%{_libdir}/npcdmod.o \
    $RPM_BUILD_ROOT%{_libdir}/nagios/brokers/npcdmod.o
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir}/
+# Remove install check script
+# as it is not required if all dependencies are met.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -120,23 +116,28 @@ fi
 %doc THANKS contrib/
 %dir %{_sysconfdir}/pnp4nagios
 %config(noreplace) %{_sysconfdir}/pnp4nagios/*
-%config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %attr(755,root,root) %{_initrddir}/npcd
 %attr(755,root,root) %{_sbindir}/npcd
 %{_libdir}/nagios/brokers/npcdmod.o
-%dir %{_libexecdir}/pnp4nagios
-%attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl
-%attr(755,root,root) %{_libexecdir}/pnp4nagios/check_pnp_rrds.pl
-%attr(755,root,root) %{_libexecdir}/pnp4nagios/verify_pnp_config.pl
+%dir %{_libexecdir}/%{name}
+%attr(755,root,root) %{_libexecdir}/%{name}/*
 %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name}
 %attr(755,nagios,nagios) %{_localstatedir}/log/%{name}
 %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name}
-%{_datadir}/nagios/html/pnp4nagios
-# kohana
-%dir %{_libdir}/kohana/system
-%{_libdir}/kohana/system
+%{_datadir}/nagios/html/%{name}
+%{_mandir}/man8/*
+# no not package Kohana
+%exclude %{_libdir}/kohana
 
 %changelog
+* Wed Nov 16 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.15-1
+- update to upstream
+- remove /usr/share/nagios/html/pnp4nagios/install.php
+- added /etc/httpd/conf.d/pnp4nagios.conf
+- removed -sample suffix from rest of sample files
+
 * Tue Oct 11 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-3
 - Updated renaming of "-sample" config files.
 
diff --git a/sources b/sources
index f010b6b..7f86fbf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 9dbbf08191a258f6798c9516b3821ff0  pnp-0.4.14.tar.gz
 a8afe81ac5502ee8ec12d77a0203b6d4  pnp4nagios-0.6.1.tar.gz
+27cdab96510e15cfa0f4b7c2bf15dd2b  pnp4nagios-0.6.15.tar.gz