[packages/php-xcache] - patch config loading for webapp

[glen]

commit 6620175cb902a284ef6063b03bbd8361b3195660
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Nov 21 19:58:09 2012 +0200

    - patch config loading for webapp

 config.patch    | 33 +++++++++++++++++++++++++++++++++
 ini.patch       | 13 -------------
 php-xcache.spec |  4 ++--
 3 files changed, 35 insertions(+), 15 deletions(-)
---
diff --git a/php-xcache.spec b/php-xcache.spec
index c3af297..c728ab0 100644
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -5,7 +5,7 @@ Summary:	%{modname} - PHP opcode cacher
 Summary(pl.UTF-8):	%{modname} - buforowanie opcodów PHP
 Name:		php-%{modname}
 Version:	3.0.0
-Release:	0.5
+Release:	0.6
 License:	BSD
 Group:		Development/Languages/PHP
 URL:		http://xcache.lighttpd.net/
@@ -13,7 +13,7 @@ Source0:	http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.ta
 # Source0-md5:	63be7c8b14ffc01babe5378111f13228
 Source1:	%{modname}-apache.conf
 Source2:	%{modname}-lighttpd.conf
-Patch0:		ini.patch
+Patch0:		config.patch
 BuildRequires:	php-devel >= 4:5.2.17-8
 BuildRequires:	rpmbuild(macros) >= 1.344
 BuildRequires:	sed >= 4.0
diff --git a/config.patch b/config.patch
new file mode 100644
index 0000000..69433dd
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,33 @@
+--- xcache-3.0.0/xcache.ini~	2012-10-18 10:49:34.000000000 +0300
++++ xcache-3.0.0/xcache.ini	2012-11-21 17:37:53.122003769 +0200
+@@ -1,9 +1,5 @@
+-;; this is an example, it won't work unless properly configured into php.ini
+ [xcache-common]
+-;; non-Windows example:
+-extension = xcache.so
+-;; Windows example:
+-; extension = php_xcache.dll
++extension = @extensiondir@/xcache.so
+ 
+ [xcache.admin]
+ xcache.admin.enable_auth = On
+--- xcache-3.0.0/htdocs/common/common.php~	2012-10-18 10:49:31.000000000 +0300
++++ xcache-3.0.0/htdocs/common/common.php	2012-11-21 19:41:43.568179416 +0200
+@@ -248,16 +248,7 @@
+ ini_set('magic_quotes_runtime', '0');
+ 
+ $config = array();
+-if (file_exists("./config.default.php")) {
+-	include "./config.default.php";
+-}
+-include "../config.default.php";
+-if (file_exists("../config.php")) {
+-	include "../config.php";
+-}
+-if (file_exists("./config.php")) {
+-	include "./config.php";
+-}
++include "../config.php";
+ 
+ $strings = array();
+ include get_language_file("../common/lang");
diff --git a/ini.patch b/ini.patch
deleted file mode 100644
index 6fd01ee..0000000
--- a/ini.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xcache-3.0.0/xcache.ini~	2012-10-18 10:49:34.000000000 +0300
-+++ xcache-3.0.0/xcache.ini	2012-11-21 17:37:53.122003769 +0200
-@@ -1,9 +1,5 @@
--;; this is an example, it won't work unless properly configured into php.ini
- [xcache-common]
--;; non-Windows example:
--extension = xcache.so
--;; Windows example:
--; extension = php_xcache.dll
-+extension = @extensiondir@/xcache.so
- 
- [xcache.admin]
- xcache.admin.enable_auth = On
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-xcache.git/commitdiff/6620175cb902a284ef6063b03bbd8361b3195660