[pnp4nagios/el6: 5/5] Merge branch 'master' into el6 Updated to 0.6.1. Conflicts: pnp4nagios.spec

[Ján ONDREJ]

commit 230ffa469bd9cc2605eebc070f5465e8a84283e5
Merge: 313c57f 18d361a
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Tue Oct 11 16:04:22 2011 +0200

    Merge branch 'master' into el6
    Updated to 0.6.1.
    Conflicts:
    	pnp4nagios.spec

 .gitignore      |    1 +
 pnp4nagios.spec |   54 ++++++++++++++++++++++++++++++++++--------------------
 sources         |    1 +
 3 files changed, 36 insertions(+), 20 deletions(-)
---
diff --cc pnp4nagios.spec
index 6adbef1,dfa244d..74dd296
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@@ -126,15 -131,17 +132,23 @@@ f
  %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
  
  %changelog
+ * Tue Oct 11 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-3
+ - Updated renaming of "-sample" config files.
+ 
+ * Wed Sep 14 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-1
+ - Update to 0.6.1.
+ 
 +* Tue Sep 13 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.4.14-7
 +- added perl-Time-HiRes to build requires
 +
 +* Tue Sep 13 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.4.14-6
 +- rebuilt for EPEL-6
 +
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.14-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild