Author: shadzik                      Date: Sun Oct 29 01:00:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- automate Requires
- cosmetics

---- Files affected:
SPECS:
   nagios-grapher.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/nagios-grapher.spec
diff -u SPECS/nagios-grapher.spec:1.37 SPECS/nagios-grapher.spec:1.38
--- SPECS/nagios-grapher.spec:1.37      Sun Oct 29 02:15:13 2006
+++ SPECS/nagios-grapher.spec   Sun Oct 29 02:59:58 2006
@@ -3,6 +3,7 @@
 # - change path for rrd font in ngraph.ncfg
 # - bconds for network/pipe
 # - service nagios-grapher does not support chkconfig
+%include       /usr/lib/rpm/macros.perl
 Summary:       Plugins for Nagios to integration with RRDTool
 Summary(pl):   Wtyczka dla Nagiosa integrująca z RRDTool
 Name:          nagios-grapher
@@ -18,20 +19,14 @@
 Patch3:                %{name}-syntax_error.patch
 Patch4:                %{name}-extinfo_file.patch
 Patch5:                %{name}-perl_path.patch
-Patch6:         %{name}-rrdfont_path.patch
+Patch6:                %{name}-rrdfont_path.patch
 URL:           http://tinyurl.com/ad67c
+BuildRequires: rpm-perlprov
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
 Requires:      ImageMagick-perl
 Requires:      nagios-cgi
-Requires:      perl-GD
-Requires:      perl-XML-Simple
-Requires:      perl-rrdtool
-Requires:      perl-Time-HiRes
-Requires:      perl-URI
-Requires:      perl-IO-All
-Requires:      perl-XML-Parser
-Requires:      perl-HTML-Calendar-Simple
 Requires:      rrdtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,7 +42,7 @@
 - recognizing new hosts/services and automatic graphing of these
 - auto pruning and abstracting of stored values
 - very slim backend - no need of a database systems rrdtool
-- easy to install 
+- easy to install
 
 %description -l pl
 NagiosGrapher gromadzi wyjście z wtyczek Nagiosa i generuje wykresy.
@@ -61,7 +56,7 @@
 - łatwy w instalacji
 
 %prep
-%setup -q -c -a 0  
+%setup -q -c -a 0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -86,7 +81,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -d $RPM_BUILD_ROOT/etc/nagios/serviceext
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/nagios/serviceext
 install -d $RPM_BUILD_ROOT%{_var}/log/nagios
 install -d $RPM_BUILD_ROOT%{_var}/lib/nagios/nagios_grapher
 
@@ -94,7 +89,7 @@
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/nagios_grapher
-rm -f $RPM_BUILD_ROOT/usr/lib/nagios/grapher/*.c
+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}/
@@ -138,6 +133,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/10/29 00:59:58  shadzik
+- automate Requires
+- cosmetics
+
 Revision 1.37  2006/10/29 00:15:13  wolvverine
 - add patch for rrdfont path
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-grapher.spec?r1=1.37&r2=1.38&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to