packages: nagios-ndoutils/nagios-ndoutils.spec, nagios-ndoutils/ndo2db.init...

[glen]

Author: glen                         Date: Sat Jan 14 22:57:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix paths in config

---- Files affected:
packages/nagios-ndoutils:
   nagios-ndoutils.spec (1.6 -> 1.7) , ndo2db.init (1.1 -> 1.2) , config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-ndoutils/nagios-ndoutils.spec
diff -u packages/nagios-ndoutils/nagios-ndoutils.spec:1.6 packages/nagios-ndoutils/nagios-ndoutils.spec:1.7
--- packages/nagios-ndoutils/nagios-ndoutils.spec:1.6	Sat Jan 14 23:51:22 2012
+++ packages/nagios-ndoutils/nagios-ndoutils.spec	Sat Jan 14 23:57:17 2012
@@ -8,7 +8,7 @@
 %bcond_without	ssl	# build without ssl support
 
 %define		extraver	b9
-%define		rel		0.4
+%define		rel		0.5
 Summary:	NDOUTILS (Nagios Data Output Utils) addon
 Summary(pl.UTF-8):	Dodatek NDOUTILS (Nagios Data Output Utils)
 Name:		nagios-ndoutils
@@ -19,6 +19,7 @@
 Source0:	http://downloads.sourceforge.net/nagios/ndoutils-%{version}%{extraver}.tar.gz
 # Source0-md5:	659b759a5eb54b84eb44a29f26b603bc
 Source1:	ndo2db.init
+Patch0:		config.patch
 URL:		http://sourceforge.net/projects/nagios/
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ssl:BuildRequires:	openssl-devel}
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q -n ndoutils-%{version}%{extraver}
+%patch0 -p1
 
 # some typo ;)
 grep -r 20052-2009 -l . | xargs sed -i -e 's,20052-2009,2005-2009,'
@@ -54,6 +56,7 @@
 	%{?with_pgsql:--enable-pgsql} \
 	%{?with_ssl:--enable-ssl} \
 	--bindir=%{_sbindir} \
+	--localstatedir=/var/lib/nagios \
 	--with-init-dir=/etc/rc.d/init.d
 %{__make} -j1
 
@@ -112,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2012/01/14 22:57:17  glen
+- fix paths in config
+
 Revision 1.6  2012/01/14 22:51:22  glen
 - initscript deps
 

================================================================
Index: packages/nagios-ndoutils/ndo2db.init
diff -u packages/nagios-ndoutils/ndo2db.init:1.1 packages/nagios-ndoutils/ndo2db.init:1.2
--- packages/nagios-ndoutils/ndo2db.init:1.1	Sat Jan 14 23:49:44 2012
+++ packages/nagios-ndoutils/ndo2db.init	Sat Jan 14 23:57:17 2012
@@ -40,7 +40,7 @@
 
 # Set defaults
 configfile=/etc/nagios/ndo2db.cfg
-pidfile=/var/lib/nagios/ndo2db.lock
+pidfile=/var/lib/nagios/ndo2db.pid
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/ndo2db ] && . /etc/sysconfig/ndo2db

================================================================
Index: packages/nagios-ndoutils/config.patch
diff -u /dev/null packages/nagios-ndoutils/config.patch:1.1
--- /dev/null	Sat Jan 14 23:57:22 2012
+++ packages/nagios-ndoutils/config.patch	Sat Jan 14 23:57:17 2012
@@ -0,0 +1,20 @@
+--- ndoutils-1.4b9/config/ndo2db.cfg-sample.in	2009-09-15 15:08:32.000000000 +0300
++++ ndoutils-1.4b9/config/ndo2db.cfg-sample.in	2012-01-15 00:53:16.756690000 +0200
+@@ -10,7 +10,7 @@
+ # This is the lockfile that NDO2DB will use to store its PID number
+ # in when it is running in daemon mode.
+ 
+-lock_file=@localstatedir@/ndo2db.lock
++lock_file=@localstatedir@/ndo2db.pid
+ 
+ 
+ 
+@@ -177,7 +177,7 @@
+ # DEBUG FILE
+ # This option determines where the daemon should write debugging information.
+ 
+-debug_file=@localstatedir@/ndo2db.debug
++debug_file=/var/log/nagios/ndo2db.log
+ 
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-ndoutils/nagios-ndoutils.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-ndoutils/ndo2db.init?r1=1.1&r2=1.2&f=u