packages: cacti-template-apache/cacti-template-apache.spec, cacti-template-...

[glen]

Author: glen                         Date: Sun Jan  9 20:02:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- small fixes

---- Files affected:
packages/cacti-template-apache:
   cacti-template-apache.spec (1.2 -> 1.3) , fixes.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cacti-template-apache/cacti-template-apache.spec
diff -u packages/cacti-template-apache/cacti-template-apache.spec:1.2 packages/cacti-template-apache/cacti-template-apache.spec:1.3
--- packages/cacti-template-apache/cacti-template-apache.spec:1.2	Thu Jan  6 15:20:47 2011
+++ packages/cacti-template-apache/cacti-template-apache.spec	Sun Jan  9 21:02:49 2011
@@ -3,7 +3,7 @@
 Summary:	Apache Stats
 Name:		cacti-template-%{template}
 Version:	0.6
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/download/file.php?id=301#/apachestats-0.4.zip
@@ -12,6 +12,7 @@
 # Source1-md5:	cb460f3c00707dcb960efe8c4ceff0c1
 Source2:	http://forums.cacti.net/download/file.php?id=7534#/SS_Apache_Stats-curl.zip
 # Source2-md5:	71112bf32403e548120b3b76eadd5a75
+Patch0:		fixes.patch
 URL:		http://forums.cacti.net/about17995.html
 BuildRequires:	rpmbuild(macros) >= 1.554
 Requires:	cacti >= 0.8.7g-6
@@ -29,6 +30,7 @@
 %prep
 %setup -qc -a1 -a2
 mv apachestats-0.4/* .
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/01/09 20:02:49  glen
+- small fixes
+
 Revision 1.2  2011/01/06 14:20:47  glen
 - works, so rel 1
 

================================================================
Index: packages/cacti-template-apache/fixes.patch
diff -u /dev/null packages/cacti-template-apache/fixes.patch:1.1
--- /dev/null	Sun Jan  9 21:02:54 2011
+++ packages/cacti-template-apache/fixes.patch	Sun Jan  9 21:02:49 2011
@@ -0,0 +1,21 @@
+--- cacti-template-apache-0.6/ss_apache_stats.php~	2006-12-13 08:02:48.000000000 +0200
++++ cacti-template-apache-0.6/ss_apache_stats.php	2011-01-09 22:01:52.718817316 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ /*
+ 	ApacheStats 0.6?
+@@ -26,7 +27,6 @@
+ error_reporting(E_ERROR);
+ 
+ include_once(dirname(__FILE__) . "/../include/config.php");
+-include_once(dirname(__FILE__) . "/../lib/snmp.php");
+ 
+ if (!isset($called_by_script_server)) {
+         array_shift($_SERVER["argv"]);
+@@ -103,5 +103,3 @@
+ 	return trim(str_replace(array("\r","\n"),'', $output));
+ 
+ }//end ss_apache_stats function
+-
+-?>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-apache/cacti-template-apache.spec?r1=1.2&r2=1.3&f=u