[pnp4nagios] - update to upstream - remove /usr/share/nagios/html/pnp4nagios/install.php - added /etc/httpd/conf.
Ján ONDREJ
ondrejj at fedoraproject.org
Wed Nov 16 20:50:37 UTC 2011
commit bd961756f817b7ec9f7decd6ef340445a7b09c24
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Wed Nov 16 21:50:26 2011 +0100
- 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
pnp4nagios.spec | 57 +++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index dfa244d..74b7915 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
@@ -33,15 +30,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
@@ -67,30 +55,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
@@ -119,23 +113,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
+%{_datadir}/nagios/html/%{name}
+%{_mandir}/man8/*
# kohana
-%dir %{_libdir}/kohana/system
%{_libdir}/kohana/system
%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.
More information about the scm-commits
mailing list