SPECS: cacti.spec - silence php warning accessing items from array that don...

[glen]

Author: glen                         Date: Tue Oct  7 16:30:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- silence php warning accessing items from array that don't exist if queried host is unreachable
- renum patches
- make cli/* executable
- rel 11

---- Files affected:
SPECS:
   cacti.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: SPECS/cacti.spec
diff -u SPECS/cacti.spec:1.88 SPECS/cacti.spec:1.89
--- SPECS/cacti.spec:1.88	Sun Oct  5 16:47:55 2008
+++ SPECS/cacti.spec	Tue Oct  7 18:30:06 2008
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Cacti - frontend w PHP do rrdtoola
 Name:		cacti
 Version:	0.8.7b
-Release:	10
+Release:	11
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -16,15 +16,16 @@
 Source4:	%{name}-apache.conf
 Source5:	%{name}-lighttpd.conf
 Source6:	%{name}-rrdpath.sql
-Patch1:		%{name}-upgrade_from_086k_fix.patch
-Patch2:		http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch
-Patch3:		http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
-Patch4:		%{name}-config.patch
-Patch5:		%{name}-adodb.patch
-Patch6:		%{name}-ioerror.patch
-Patch7:		%{name}-webroot.patch
-Patch8:		%{name}-linux_memory.patch
-Patch9:		%{name}-log-verbosity.patch
+Patch100:	http://www.cacti.net/downloads/patches/0.8.7b/upgrade_from_086k_fix.patch
+Patch101:	http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch
+Patch102:	http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
+Patch0:		%{name}-config.patch
+Patch1:		%{name}-adodb.patch
+Patch2:		%{name}-ioerror.patch
+Patch3:		%{name}-webroot.patch
+Patch4:		%{name}-linux_memory.patch
+Patch5:		%{name}-log-verbosity.patch
+Patch6:		%{name}-ss_disk-array-indices.patch
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
@@ -97,16 +98,17 @@
 
 %prep
 %setup -q -a 3
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%{__patch} -p1 -s < cacti-plugin-arch/cacti-plugin-0.8.7b-PA-v2.1.diff
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{__patch} -p1 -s < cacti-plugin-arch/cacti-plugin-0.8.7b-PA-v2.1.diff
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 mkdir -p sql
 mv *.sql sql
@@ -117,12 +119,16 @@
 rm -rf cacti-plugin-arch
 rm -rf lib/adodb
 rm -f log/.htaccess
+rm -f cli/.htaccess
 rm -f rra/.placeholder
 rm -f plugins/index.php
 
 %{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
 chmod a+rx scripts/*
 
+%{__sed} -i -e '1i#!%{_bindir}/php' cli/*.php
+chmod a+rx cli/*
+
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
@@ -203,10 +209,12 @@
 %{_appdir}/lib
 %{_appdir}/include
 %{_appdir}/images
-%{_appdir}/cli
 %{_appdir}/plugins
 %{_appdir}/*.php
 
+%dir %{_appdir}/cli
+%attr(755,root,root) %{_appdir}/cli/*
+
 %dir %{_appdir}/scripts
 %attr(755,root,root) %{_appdir}/scripts/*
 
@@ -229,6 +237,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2008/10/07 16:30:06  glen
+- silence php warning accessing items from array that don't exist if queried host is unreachable
+- renum patches
+- make cli/* executable
+- rel 11
+
 Revision 1.88  2008/10/05 14:47:55  glen
 - verbosity none is supposed to be mute!
 - add sql patch to update rrd paths in database (banner perhaps?)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti.spec?r1=1.88&r2=1.89&f=u