- up to 3.0.0

diff --git a/ini.patch b/ini.patch
index 61206530c2b9ec7be183ce7027554d74e069a386..6fd01eeda7fa76515b1ee6b24eba5837360e463e 100644 (file)
--- a/ini.patch
+++ b/ini.patch
@@ -1,17 +1,13 @@
---- xcache-2.0.1/xcache.ini.bak        2012-06-26 13:11:30.000000000 +0300
-+++ xcache-2.0.1/xcache.ini    2012-08-22 11:47:44.403556474 +0300
-@@ -5,11 +5,11 @@
- 
- ;; non-windows example
- ;; update xxx accordingly
--zend_extension = /usr/local/lib/php/extensions/non-debug-non-zts-xxx/xcache.so
-+;zend_extension = /usr/local/lib/php/extensions/non-debug-non-zts-xxx/xcache.so
- ;; windows example:
--zend_extension_ts = c:/php/extensions/php_xcache.dll
-+;zend_extension_ts = c:/php/extensions/php_xcache.dll
- ;; for newer PHP, _ts is removed, use the following line instead
--zend_extension = c:/php/extensions/php_xcache.dll
-+zend_extension = @extensiondir@/xcache.so
+--- 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

diff --git a/php-xcache.spec b/php-xcache.spec
index 28ed49df00f1ff163867a17dbf24b93bb55caa9c..bfa2365cfaa12b793d05ad9382f043fc68815339 100644 (file)
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -2,13 +2,13 @@
 Summary:       %{modname} - PHP opcode cacher
 Summary(pl.UTF-8):     %{modname} - buforowanie opcodów PHP
 Name:          php-%{modname}
-Version:       2.0.1
-Release:       4
+Version:       3.0.0
+Release:       0.2
 License:       BSD
 Group:         Development/Languages/PHP
 URL:           http://xcache.lighttpd.net/
 Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/xcache-%{version}.tar.bz2
-# Source0-md5: d3bc9645dc1b084c1eb45cfc4d8e9ccc
+# Source0-md5: 63be7c8b14ffc01babe5378111f13228
 Source1:       %{modname}-apache.conf
 Source2:       %{modname}-lighttpd.conf
 Patch0:                ini.patch
@@ -52,6 +52,8 @@ More information you can find at %{url}.
        s,@extensiondir@,%{php_extensiondir},
 ' xcache.ini
 
+mv htdocs/{config.default.php,config.php}
+
 %build
 phpize
 %configure \
@@ -73,7 +75,7 @@ install -d $RPM_BUILD_ROOT%{_appdir}
 
 # Drop in the bit of configuration
 cp -p xcache.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
-cp -a admin/* $RPM_BUILD_ROOT%{_appdir}
+cp -a htdocs/* $RPM_BUILD_ROOT%{_appdir}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf