- small fixes

Changed files:
    cacti-template-apache.spec -> 1.3
    fixes.patch -> 1.1

diff --git a/cacti-template-apache.spec b/cacti-template-apache.spec
index a8aa57d765c3c8a38cea1e13a73262229a6c807c..3107446d0df97858cfb7e4fddee8c91c77fe59dc 100644 (file)
--- a/cacti-template-apache.spec
+++ b/cacti-template-apache.spec
@@ -2,7 +2,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
@@ -11,6 +11,7 @@ Source1:      http://forums.cacti.net/download/file.php?id=7674#/ss_apache_stats-wget
 # 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
@@ -28,6 +29,7 @@ Apache Stats for Cacti (PHP Script Server Version).
 %prep
 %setup -qc -a1 -a2
 mv apachestats-0.4/* .
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT

diff --git a/fixes.patch b/fixes.patch
new file mode 100644 (file)
index 0000000..5f3b09b
--- /dev/null
+++ b/fixes.patch
@@ -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
+-
+-?>