--- rpms/smeserver-nagios/contribs8/smeserver-nagios.spec	2013/10/13 23:47:50	1.3
+++ rpms/smeserver-nagios/contribs8/smeserver-nagios.spec	2013/10/16 02:25:58	1.6
@@ -1,4 +1,4 @@
-# $Id: smeserver-nagios.spec,v 1.2 2013/10/13 23:07:24 unnilennium Exp $
+# $Id: smeserver-nagios.spec,v 1.5 2013/10/14 03:53:56 unnilennium Exp $
 # Authority: mweinber
 # Name: Michael Weinberger
 
@@ -6,7 +6,7 @@ Summary: Nagios integration
 %define name smeserver-nagios
 Name: %{name}
 %define version 2.0.0
-%define release 3
+%define release 6 
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,8 @@ Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-nagios-2.0.0-usermod.patch
 Patch1: smeserver-nagios-2.0.0-dbinit.patch
+Patch2: smeserver-nagios-2.0.0-pnpalias.patch
+Patch3: smeserver-nagios-2.0.0-pnppath.patch
 BuildRoot: /var/tmp/%{name}-buildroot/
 BuildArch: noarch
 Requires: smeserver-release >= 8
@@ -27,13 +29,21 @@ BuildRequires: e-smith-devtools
 AutoReq: no
 
 %changelog
-* Sun Oct 13 2013 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.0-3.sme
+* Tue Oct 15 2013 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.0-6.sme
+- libexec nagios path [SME: 7908]
+- another time for [SME: 5539](one line missing in patch)
+
+* Sun Oct 13  2013 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.0-5.sme
+- pnp4nagio web path [SME: 7905]
+
+* Sun Oct 13 2013 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.0-4.sme
 - usermod bug [SME: 5539]
 - add requirements to ease isntallation : nagios-plugins nagios-plugins-setuid
 -  smeserver-nagios-plugins-mysql and smeserver-nagios-backup  
 - inserted config db default
 - added users to accounts defaults
 - corrected /etc/nagios/nagios.cfg-smeserver
+- /var/run/nagios
 
 * Mon Nov 17 2008 Michael Weinberger <mweinber@neddix.de> 2.0.0-1.sme
   removed scripts frpm spec file
@@ -54,6 +64,8 @@ Nagios integration
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build