SPECS: nagios-grapher.spec - update to 1.6.1-rc5-0.5

Sun Nov 30 16:44:51 CET 2008

Author: glen                         Date: Sun Nov 30 15:44:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 1.6.1-rc5-0.5

---- Files affected:
SPECS:
   nagios-grapher.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/nagios-grapher.spec
diff -u SPECS/nagios-grapher.spec:1.43 SPECS/nagios-grapher.spec:1.44

--- SPECS/nagios-grapher.spec:1.43	Tue Feb 13 08:16:49 2007
+++ SPECS/nagios-grapher.spec	Sun Nov 30 16:44:45 2008
@@ -1,31 +1,29 @@
 # $Revision$, $Date$
 # TODO
-# - path for rrd font from config.layout (patch for configure.ac and ngraph.ncfg.in)
-# - bconds for network/pipe
-# - service nagios-grapher does not support chkconfig
 # - logrotate config
 # - !! patch for collect2.pl - user,group,permision for files/dirs
 #	defined in ngraph.ncfg (look %files section)
 # - !!	patch for lib/NagiosGrapher/Hooks/SrvExtWriteHostextInfo.pm line 94
 
-%define		_rc	rc2
-%define		_rel	0.1
+%define		subver	rc5
+%define		subver2	0.5
+%define		rel		0.8
 %include	/usr/lib/rpm/macros.perl
 Summary:	Plugins for Nagios to integration with RRDTool
 Summary(pl.UTF-8):	Wtyczka dla Nagiosa integrująca z RRDTool
 Name:		nagios-grapher
 Version:	1.6.1
-Release:	0.%{_rc}.%{_rel}
+Release:	0.%{subver}.%{rel}
 License:	GPL
 Group:		Applications/System
-Source0:	NagiosGrapher-%{version}-%{_rc}.tar.bz2
-# Source0-md5:	d0a5257203851c168e776f597bfbd56b
+Source0:	https://www.nagiosforge.org/gf/download/frsrelease/101/44/NagiosGrapher-%{version}-%{subver}-%{subver2}.tar.gz
+# Source0-md5:	4c7ce3a350a5be900bb75c2c5f4ae170
+Source1:	nagios-grapher.init
 Patch0:		%{name}-install.patch
-Patch1:		%{name}-install_init.patch
+Patch1:		%{name}-layout.patch
 Patch2:		%{name}-init.patch
 Patch3:		%{name}-perl_path.patch
-Patch4:		%{name}-rrdfont_path.patch
-URL:		http://tinyurl.com/ad67c
+URL:		http://www.netways.de/de/produkte/nagios_addons/nagiosgrapher/
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -62,80 +60,91 @@
 - łatwy w instalacji
 
 %prep
-%setup -q -n NagiosGrapher-%{version}-%{_rc}
+%setup -q -n NagiosGrapher-%{version}-%{subver}-%{subver2}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+# pointless to include in %doc
+rm -f doc/gpl.txt
 
 %build
 %{__autoconf}
-
-%configure \
+bash %configure \
 	--with-web-user=http \
 	--with-web-group=http \
 	--with-nagios-user=nagios \
 	--with-nagios-group=nagios-data \
+	--with-perl-include=%{perl_vendorlib} \
 	--with-ng-srvext-type=MULTIPLE \
 	--with-ng-loglevel=355 \
-	--with-layout=PLD \
+	--with-layout=pld_linux \
 	--with-ng-interface=network
 
+%{__make} -j1 all-install-messages > README
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/nagios/{serviceext,hostext}
 install -d $RPM_BUILD_ROOT/var/log/nagios
 install -d $RPM_BUILD_ROOT/var/lib/nagios/nagios_grapher
 
-%{__make} install \
+%{__make} install -j1 \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	NAGIOS_PROC_USER=%(id -un) \
+	NAGIOS_PROC_GROUP=%(id -gn) \
+	APACHE_GROUP=%(id -gn) \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/nagios_grapher
 rm -f $RPM_BUILD_ROOT%{_plugindir}/*.c
 
-install contrib/nagios_grapher.redhat	$RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install contrib/fifo_write/tcp/fifo_write_from_tcp.pl	$RPM_BUILD_ROOT%{_plugindir}/
-install contrib/fifo_write/udpsend.pl       $RPM_BUILD_ROOT%{_plugindir}/
-install contrib/rrd_commix/*[yl]       $RPM_BUILD_ROOT%{_plugindir}/
+rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/nagios_grapher
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install contrib/fifo_write/tcp/fifo_write_from_tcp.pl $RPM_BUILD_ROOT%{_plugindir}
+install contrib/fifo_write/udpsend.pl $RPM_BUILD_ROOT%{_plugindir}
+install contrib/rrd_commix/*[yl] $RPM_BUILD_ROOT%{_plugindir}
 cp contrib/rrd_commix/README contrib/rrd_commix/README-rrd_commix
 
+# copies in %doc
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/nagios/ngraph.d/templates/standard/*_disabled
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/nagios/ngraph.d/templates/extra/*_disabled
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ "$1" = 1 ]; then
-	if [ ! -f /var/log/nagios/ngraph.log ]; then
-		touch /var/log/nagios/ngraph.log
-		chown nagios:nagios-data /var/log/nagios/ngraph.log
-		chmod 660 /var/log/nagios/ngraph.log
-	fi
+if [ ! -f /var/log/nagios/ngraph.log ]; then
+	touch /var/log/nagios/ngraph.log
+	chown nagios:nagios-data /var/log/nagios/ngraph.log
+	chmod 660 /var/log/nagios/ngraph.log
 fi
-#/sbin/chkconfig --add %{name}
+/sbin/chkconfig --add %{name}
 %service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
 	%service -q %{name} stop
-#	/sbin/chkconfig --del %{name}
+	/sbin/chkconfig --del %{name}
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc README doc contrib/rrd_commix/README-rrd_commix
+%doc README doc/* contrib/rrd_commix/README-rrd_commix cfg/templates
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-#%%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%config(noreplace) %verify(not md5 mtime size) %attr(640,nagios,nagios-data) %{_sysconfdir}/nagios/ngraph.d/*
-%config(noreplace) %verify(not md5 mtime size) %attr(640,nagios,nagios-data) %{_sysconfdir}/nagios/*.ncfg
-%dir  %attr(775,nagios,nagios-data) %{_sysconfdir}/nagios/serviceext
-%dir  %attr(775,nagios,nagios-data) %{_sysconfdir}/nagios/hostext
-#%%config(noreplace) %verify(not md5 mtime size) %attr(640,nagios,nagios-data) %{_sysconfdir}/nagios/serviceext/*
+%dir %{_sysconfdir}/nagios/ngraph.d
+%dir %{_sysconfdir}/nagios/ngraph.d/templates
+%dir %{_sysconfdir}/nagios/ngraph.d/templates/extra
+%dir %{_sysconfdir}/nagios/ngraph.d/templates/standard
+
+%config(noreplace) %verify(not md5 mtime size) %attr(640,nagios,nagios-data) %{_sysconfdir}/nagios/ngraph.d/nmgraph.ncfg
+%config(noreplace) %verify(not md5 mtime size) %attr(640,nagios,nagios-data) %{_sysconfdir}/nagios/ngraph.ncfg
 %dir %{_plugindir}
 %attr(755,root,root) %{_plugindir}/*
 %attr(755,root,root) %{_libdir}/nagios/cgi/*
-%attr(755,root,root) %{perl_vendorlib}/*
 %{_datadir}/nagios/images/*
+
 %dir %attr(755,nagios,nagios-data) /var/lib/nagios/nagios_grapher
 %ghost /var/log/nagios/ngraph.log
 
@@ -145,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2008/11/30 15:44:45  glen
+- update to 1.6.1-rc5-0.5
+
 Revision 1.43  2007/02/13 07:16:49  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nagios-grapher.spec?r1=1.43&r2=1.44&f=u

