From 337d6b6e480daf01303dd0f215e95d6b0d08de36 Mon Sep 17 00:00:00 2001
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Mar 04 2013 06:41:01 +0000
Subject: Fixed release in changelog.

Merge branch 'master' into f17

Conflicts:
	pnp4nagios.spec

---

diff --git a/.gitignore b/.gitignore
index caa8df4..ba15cc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pnp-0.4.14.tar.gz
 /pnp4nagios-0.6.15.tar.gz
 /pnp4nagios-0.6.16.tar.gz
 /pnp4nagios-0.6.19.tar.gz
+/pnp4nagios-0.6.20.tar.gz
diff --git a/pnp4nagios-README.fedora b/pnp4nagios-README.fedora
index 1ada1e9..fb15f76 100644
--- a/pnp4nagios-README.fedora
+++ b/pnp4nagios-README.fedora
@@ -72,5 +72,5 @@ define command{
 
 define hostextinfo {
     host_name localhost
-    action_url /nagios/pnp4nagios/index.php?host=$HOSTNAME$
+    action_url /pnp4nagios/graph?host=$HOSTNAME$
     }
diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 7c49024..3243d76 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,5 +1,5 @@
 Name:           pnp4nagios
-Version:        0.6.19
+Version:        0.6.20
 Release:        1%{?dist}
 Summary:        Nagios performance data analysis tool
 
@@ -30,14 +30,6 @@ and stores them automatically into RRD-databases.
 %prep
 %setup -q
 
-# 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
-#touch -r verify_pnp_config.txt verify_pnp_config.txt.utf8
-#mv -f verify_pnp_config.txt.utf8 verify_pnp_config.txt
-#sed -i -e "s/\r//" verify_pnp_config.txt
-popd
-
 cp -p %{SOURCE3} README.fedora
 sed -i -e 's/^INSTALL_OPTS="-o $nagios_user -g $nagios_grp"/INSTALL_OPTS=""/' \
     configure
@@ -45,14 +37,14 @@ sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in
 
 
 %build
-%configure --bindir=%{_sbindir}/ \
-           --libexecdir=%{_libexecdir}/%{name}/ \
-           --sysconfdir=%{_sysconfdir}/%{name}/ \
-           --localstatedir=%{_localstatedir}/log/%{name}/ \
-           --datadir=%{_datadir}/nagios/html/%{name}/ \
-           --datarootdir=%{_datadir}/nagios/html/%{name}/ \
-           --with-perfdata-dir=%{_localstatedir}/lib/%{name}/ \
-           --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}/
+%configure --bindir=%{_sbindir} \
+           --libexecdir=%{_libexecdir}/%{name} \
+           --sysconfdir=%{_sysconfdir}/%{name} \
+           --localstatedir=%{_localstatedir}/log/%{name} \
+           --datadir=%{_datadir}/nagios/html/%{name} \
+           --datarootdir=%{_datadir}/nagios/html/%{name} \
+           --with-perfdata-dir=%{_localstatedir}/lib/%{name} \
+           --with-perfdata-spool-dir=%{_localstatedir}/spool/%{name}
 make %{?_smp_mflags} all
 
 
@@ -138,20 +130,21 @@ fi
 %{_datadir}/nagios/html/%{name}/kohana
 
 %changelog
-* Sat Feb 16 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.19-1
+* Sun Mar 03 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.20-1
 - update to upstream
 
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.16-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Sun Feb 17 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.19-2
+- updated hostextinfo URL for pnp4nagios 0.6
+- spec file cleanup
 
-* Sat Aug 11 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-4
-- CVE-2012-3457 - process_perfdata.cfg world readable
+* Sat Feb 16 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.19-1
+- update to upstream
 
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Mon Sep 03 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-4
+- CVE-2012-3457 - process_perfdata.cfg world readable
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Thu Apr 05 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-2
+- Removed double slashes fro directories (BZ#810212).
 
 * Thu Nov 24 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.16-1
 - update to upstream
diff --git a/sources b/sources
index 725374b..ae59fde 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ a8afe81ac5502ee8ec12d77a0203b6d4  pnp4nagios-0.6.1.tar.gz
 27cdab96510e15cfa0f4b7c2bf15dd2b  pnp4nagios-0.6.15.tar.gz
 53afa0e62eb35575c16a09081be382fa  pnp4nagios-0.6.16.tar.gz
 37d69974e088a7010b7e27434b95a12d  pnp4nagios-0.6.19.tar.gz
+b6680d06b9ccd9779c5a20f1750387a3  pnp4nagios-0.6.20.tar.gz