Author: wolvverine Date: Wed Jun 21 14:42:49 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add patches, add R
---- Files affected:
SPECS:
nagios-grapher.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/nagios-grapher.spec
diff -u SPECS/nagios-grapher.spec:1.12 SPECS/nagios-grapher.spec:1.13
--- SPECS/nagios-grapher.spec:1.12 Wed Jun 21 15:49:37 2006
+++ SPECS/nagios-grapher.spec Wed Jun 21 16:42:43 2006
@@ -1,24 +1,27 @@
# $Revision$, $Date$
#TODO
# -file in BUILD/.../{contrib,doc,tools}
-
+# - noarch?
Summary: Plugins for Nagios to integration with RRDTool
Summary(pl): Wtyczka dla Nagiosa integrująca z RRDTool
Name: nagios-grapher
Version: 1.6
-Release: 0.1
+Release: 0.3
License: GPL
Group: Applications/System
Source0: NagiosGrapher-%{version}-rc1.tar.bz2
# Source0-md5: fdcc43b490f5d3f66d42e4305c61fdbb
Patch0: %{name}-install.patch
Patch1: %{name}-install_init.patch
+Patch2: %{name}-init.patch
URL: http://tinyurl.com/ad67c
BuildRequires: rpmbuild(macros) >= 1.228
Requires(post,preun): /sbin/chkconfig
Requires: nagios-cgi
Requires: rrdtool
Requires: perl-XML-Simple
+Requires: perl-rrdtool
+Requires: perl-GD
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,6 +54,8 @@
%setup -q -n NagiosGrapher-%{version}-rc1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+
%build
%configure \
@@ -75,7 +80,7 @@
NG_CONFIG_SUB=%{_sysconfdir}/nagios/ \
NG_CONFIG_CGI=%{_sysconfdir}/nagios/ \
NAGIOS_FOLDER_CGI=%{_datadir}/nagios/cgi \
- PERL_INC=%{_plugindir}/ \
+ PERL_INC=%{perl_vendorlib} \
NAGIOS_CONTRIBUTION=%{_plugindir} \
NG_LOGFILE=%{_var}/log \
@@ -83,25 +88,27 @@
#NG_RRD=/dir \
#NAGIOS_BIN=/dir
#NG_SRVEXT_DIR/dir
-#install contrib/nagios_grapher.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+rm $RPM_BUILD_ROOT/etc/rc.d/init.d/nagios_grapher
+install contrib/nagios_grapher.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
#ln -s %{_plugindir}/NagiosGrapher.pm
$RPM_BUILD_ROOT%{_libdir}/nagios/cgi/NagiosGrapher.pm
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/chkconfig --add nagios_grapher
-%service nagios_grapher restart
+/sbin/chkconfig --add %{name}
+%service %{name} restart
%preun
if [ "$1" = "0" ]; then
- %service -q nagios_grapher stop
- /sbin/chkconfig --del nagios_grapher
+ %service -q %{name} stop
+ /sbin/chkconfig --del %{name}
fi
%files
%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/nagios_grapher
+%doc README
+%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)
%{_sysconfdir}/nagios/extra/*.ncfg
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/nagios/standard/*.ncfg
@@ -109,6 +116,7 @@
%dir %{_plugindir}
%attr(755,root,root) %{_plugindir}/*
%attr(755,root,root) %{_datadir}/nagios/cgi/*
+%attr(755,root,root) %{perl_vendorlib}/*
%{_datadir}/nagios/images/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -117,6 +125,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2006/06/21 14:42:43 wolvverine
+- add patches, add R
+
Revision 1.12 2006/06/21 13:49:37 wolvverine
- new version 1.6, NFY
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nagios-grapher.spec?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
