php-xcache: adapt for SCL, drop conflicts with other cache, disable cacher in provided config

3 files changed, 122 insertions, 283 deletions

diff --git a/php-xcache-dev.spec b/php-xcache-dev.spec
deleted file mode 100644
index 031061f..0000000
--- a/php-xcache-dev.spec
+++ /dev/null
@@ -1,250 +0,0 @@
-# spec file for php-xcache
-#
-# Copyright (c) 2012-2014 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
-#
-# Please, preserve the changelog entries
-#
-%global ext_name     xcache
-#global svnrev       1264
-
-# TODO : consider splitting pages in another subpackage
-#        to avoid httpd dependency
-
-Summary:       Fast, stable PHP opcode cacher
-Name:          php-xcache
-Version:       3.1.0
-Release:       1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-License:       BSD
-Group:         Development/Languages
-URL:           http://xcache.lighttpd.net/
-
-%if 0%{?svnrev}
-# svn co -r 1264 svn://svn.lighttpd.net/xcache/trunk xcache-3.1.0
-# tar czf xcache-svn1264.tgz xcache-3.1.0
-Source0:       xcache-svn1264.tgz
-%else
-Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/%{ext_name}-%{version}.tar.gz
-%endif
-Source1:       xcache-httpd.conf
-
-# Relocation of configuration files to /etc/xcache
-Patch0:        xcache-config.patch
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: php-devel
-
-Requires:      php(zend-abi) = %{php_zend_api}
-Requires:      php(api) = %{php_core_api}
-
-# Only one opcode cache can be installed
-Conflicts:     php-pecl-apc < 3.1.15
-Conflicts:     php-eaccelerator
-Conflicts:     php-opcache
-
-# Other third party repo stuff
-Obsoletes: php53-xcache
-Obsoletes: php53u-xcache
-Obsoletes: php54-xcache
-%if "%{php_version}" > "5.5"
-Obsoletes: php55-xcache
-%endif
-
-# Filter private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-
-
-%description
-XCache is a fast, stable  PHP opcode cacher that has been tested and is now
-running on production servers under high load. 
-
-It is tested (on linux) and supported on all of the latest PHP release. 
-ThreadSafe is also perfectly supported. 
-
-It overcomes a lot of problems that has been with other competing opcachers
-such as being able to be used with new  PHP versions. 
-
-
-%package -n xcache-admin
-Summary:       XCache Administration
-Group:         Development/Languages
-Requires:      mod_php, httpd
-Requires:      %{name} = %{version}-%{release}
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-BuildArch:     noarch
-%endif
-Obsoletes:     php-xcache-admin     < 3.0.0
-Obsoletes:     php-xcache-coverager < 3.0.0
-Obsoletes:     xcache-coverager     < 3.0.0
-Provides:      xcache-coverager     = %{version}-%{release}
-
-%description -n xcache-admin
-This package provides the XCache Administration web application,
-with Apache configuration, on http://localhost/xcache
-
-This requires to configure, in XCache configuration file (xcache.ini):
-- xcache.admin.user
-- xcache.admin.pass
-- xcache.coveragedump_directory
-
-
-%prep
-%setup -q -c 
-
-# rename source folder
-mv %{ext_name}-%{version} nts
-
-cd nts
-%patch0 -p1
-
-# Sanity check, really often broken
-extver=$(sed -n '/define XCACHE_VERSION/{s/.* "//;s/".*$//;p}' xcache.h)
-if test "x${extver}" != "x%{version}%{?svnrev:-dev}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?svnrev:-dev}.
-   exit 1
-fi
-cd ..
-
-# duplicate for ZTS build
-cp -pr nts zts
-
-
-%build
-# Without --enable-xcache-assembler, --enable-xcache-encoder, --enable-xcache-decoder
-# This seems not yet implemented
-
-cd nts
-%{_bindir}/phpize
-%configure \
-    --enable-xcache \
-    --enable-xcache-constant \
-    --enable-xcache-optimizer \
-    --enable-xcache-coverager \
-    --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
-
-cd ../zts
-%{_bindir}/zts-phpize
-%configure \
-    --enable-xcache \
-    --enable-xcache-constant \
-    --enable-xcache-optimizer \
-    --enable-xcache-coverager \
-    --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
-
-
-%install
-rm -rf %{buildroot}
-# Install the NTS stuff
-make -C nts install INSTALL_ROOT=%{buildroot}
-install -D -m 644 nts/%{ext_name}.ini %{buildroot}%{php_inidir}/%{ext_name}.ini
-
-# Install the ZTS stuff
-make -C zts install INSTALL_ROOT=%{buildroot}
-install -D -m 644 zts/%{ext_name}.ini %{buildroot}%{php_ztsinidir}/%{ext_name}.ini
-
-# Install the admin stuff
-install -d -m 755 %{buildroot}%{_datadir}
-cp -pr nts/htdocs %{buildroot}%{_datadir}/xcache
-install -d -m 755 %{buildroot}%{_sysconfdir}/xcache/cacher
-install -d -m 755 %{buildroot}%{_sysconfdir}/xcache/coverager
-mv %{buildroot}%{_datadir}/xcache/config.example.php \
-   %{buildroot}%{_sysconfdir}/xcache
-mv %{buildroot}%{_datadir}/xcache/cacher/config.example.php \
-   %{buildroot}%{_sysconfdir}/xcache/cacher
-mv %{buildroot}%{_datadir}/xcache/coverager/config.example.php \
-   %{buildroot}%{_sysconfdir}/xcache/coverager
-
-install -D -m 644 -p %{SOURCE1} \
-        %{buildroot}%{_sysconfdir}/httpd/conf.d/xcache.conf
-
-
-%check
-cd nts
-
-# simple module load test
-php --no-php-ini \
-    --define extension_dir=%{buildroot}%{php_extdir}/\
-    --define extension=%{ext_name}.so \
-    --modules | grep XCache
-
-# upstream unit tests
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-php run-tests.php -n -c xcache-test.ini tests
-
-cd ../zts
-%{__ztsphp} --no-php-ini \
-    --define extension_dir=%{buildroot}%{php_ztsextdir}/\
-    --define extension=%{ext_name}.so \
-    --modules | grep XCache
-
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} run-tests.php -n -c xcache-test.ini tests
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc nts/{AUTHORS,ChangeLog,COPYING,README,THANKS}
-%config(noreplace) %{php_inidir}/%{ext_name}.ini
-%{php_extdir}/%{ext_name}.so
-%config(noreplace) %{php_ztsinidir}/%{ext_name}.ini
-%{php_ztsextdir}/%{ext_name}.so
-
-%files -n xcache-admin
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/xcache.conf
-%{_datadir}/xcache
-# No real configuration files, only sample files
-%{_sysconfdir}/xcache
-
-
-%changelog
-* Sat Oct 12 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
-- version 3.1.0
-
-* Fri Jun 14 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.3.svn1268
-- latest changes from upstream
-
-* Tue May 14 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.2.svn1238
-- latest changes from upstream
-
-* Tue Apr 16 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.1.svn1234
-- update to SVN snapshot for php 5.5 compatibility
-
-* Thu Jan 17 2013 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
-- bugfixes version
-
-* Sat Nov 22 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-1.1
-- upstream have fixed the sources (review #859504)
-
-* Wed Oct 31 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-2
-- rebuild for remi repo
-
-* Wed Oct 31 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
-- new major version
-- drop xcache-coverager subpackage
-- xcache-admin now provides cacher, coverager and diagnosis
-- run unit tests provided by upstream
-
-* Sat Oct 27 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
-- drop php prefix from sub packages
-- fix License
-- spec cleanups
-
-* Fri Sep 21 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
-- add admin and coverager sub-package
-
-* Sun Sep  9 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- initial package
-
diff --git a/php-xcache.spec b/php-xcache.spec
index 4605cd9..020bcb9 100644
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -6,64 +6,94 @@
 #
 # Please, preserve the changelog entries
 #
+%{?scl:          %scl_package             php-xcache}
+%{!?scl:         %global pkg_name         %{name}}
+%{!?scl:         %global _root_sysconfdir %{_sysconfdir}}
+%{!?scl:         %global _root_datadir    %{_datadir}}
+%{!?scl:         %global pkg_name         %{name}}
+%{!?php_inidir:  %global php_inidir       %{_sysconfdir}/php.d}
+%{!?__pecl:      %global __pecl           %{_bindir}/pecl}
+%{!?__php:       %global __php            %{_bindir}/php}
+
 %global ext_name     xcache
+#global svnrev       1264
+%global with_zts     0%{?__ztsphp:1}
+
+# TODO : consider splitting pages in another subpackage
+#        to avoid httpd dependency
 
 Summary:       Fast, stable PHP opcode cacher
-Name:          php-xcache
-Version:       3.0.4
-Release:       1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Name:          %{?scl_prefix}php-xcache
+Version:       3.1.0
+Release:       2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:       BSD
 Group:         Development/Languages
 URL:           http://xcache.lighttpd.net/
 
+%if 0%{?svnrev}
+# svn co -r 1264 svn://svn.lighttpd.net/xcache/trunk xcache-3.1.0
+# tar czf xcache-svn1264.tgz xcache-3.1.0
+Source0:       xcache-svn1264.tgz
+%else
 Source0:       http://xcache.lighttpd.net/pub/Releases/%{version}/%{ext_name}-%{version}.tar.gz
+%endif
 Source1:       xcache-httpd.conf
 
 # Relocation of configuration files to /etc/xcache
 Patch0:        xcache-config.patch
+# Disable cache to allow work with php-opcache
+Patch1:        xcache-cacher.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: php-devel
-
-Requires:      php(zend-abi) = %{php_zend_api}
-Requires:      php(api) = %{php_core_api}
+BuildRequires: %{?scl_prefix}php-devel
 
-# Only one opcode cache can be installed
-Conflicts:     php-pecl-apc < 3.1.15
-Conflicts:     php-eaccelerator
-Conflicts:     php-pecl-zendopcache
+Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
+Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 
+%if 0%{!?scl:1}
 # Other third party repo stuff
+%if "%{php_version}" > "5.4"
 Obsoletes: php53-xcache
 Obsoletes: php53u-xcache
 Obsoletes: php54-xcache
+%endif
+%if "%{php_version}" > "5.5"
+Obsoletes: php55-xcache
+%endif
+%endif
 
+%if 0%{?fedora} < 20
 # Filter private shared object
 %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
 %{?filter_setup}
+%endif
 
 
 %description
-XCache is a fast, stable  PHP opcode cacher that has been tested and is now
-running on production servers under high load. 
+XCache is a fast, stable  PHP opcode and data cacher that has been tested
+and is now running on production servers under high load.
 
 It is tested (on linux) and supported on all of the latest PHP release. 
 ThreadSafe is also perfectly supported. 
 
-It overcomes a lot of problems that has been with other competing opcachers
-such as being able to be used with new  PHP versions. 
+NOTICE: opcode cacher is disable to allow use with php-opcache only for user
+data cache. You need to edit configuration file (xcache.ini) to enable it.
 
 
-%package -n xcache-admin
+%package -n %{?scl_prefix}xcache-admin
 Summary:       XCache Administration
 Group:         Development/Languages
-Requires:      mod_php, httpd
+Requires:      %{?scl_prefix}mod_php
 Requires:      %{name} = %{version}-%{release}
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 BuildArch:     noarch
 %endif
+Obsoletes:     %{?scl_prefix}php-xcache-admin     < 3.0.0
+Obsoletes:     %{?scl_prefix}php-xcache-coverager < 3.0.0
+Obsoletes:     %{?scl_prefix}xcache-coverager     < 3.0.0
+Provides:      %{?scl_prefix}xcache-coverager     = %{version}-%{release}
 
-%description -n xcache-admin
+%description -n %{?scl_prefix}xcache-admin
 This package provides the XCache Administration web application,
 with Apache configuration, on http://localhost/xcache
 
@@ -79,19 +109,32 @@ This requires to configure, in XCache configuration file (xcache.ini):
 # rename source folder
 mv %{ext_name}-%{version} nts
 
+%if 0%{?scl:1}
+sed -e 's:%{_root_datadir}:%{_datadir}:' \
+    %{SOURCE1} >xcache-httpd.conf
+cd nts
+sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
+    -e 's:%{_root_datadir}:%{_datadir}:' \
+    %{PATCH0} | patch -p1
+%else
+cp %{SOURCE1} xcache-httpd.conf
 cd nts
 %patch0 -p1
+%endif
+%patch1 -p1
 
 # Sanity check, really often broken
 extver=$(sed -n '/define XCACHE_VERSION/{s/.* "//;s/".*$//;p}' xcache.h)
-if test "x${extver}" != "x%{version}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}.
+if test "x${extver}" != "x%{version}%{?svnrev:-dev}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?svnrev:-dev}.
    exit 1
 fi
 cd ..
 
+%if %{with_zts}
 # duplicate for ZTS build
 cp -pr nts zts
+%endif
 
 
 %build
@@ -108,6 +151,7 @@ cd nts
     --with-php-config=%{_bindir}/php-config
 make %{?_smp_mflags}
 
+%if %{with_zts}
 cd ../zts
 %{_bindir}/zts-phpize
 %configure \
@@ -117,16 +161,20 @@ cd ../zts
     --enable-xcache-coverager \
     --with-php-config=%{_bindir}/zts-php-config
 make %{?_smp_mflags}
+%endif
 
 
 %install
+rm -rf %{buildroot}
 # Install the NTS stuff
 make -C nts install INSTALL_ROOT=%{buildroot}
 install -D -m 644 nts/%{ext_name}.ini %{buildroot}%{php_inidir}/%{ext_name}.ini
 
+%if %{with_zts}
 # Install the ZTS stuff
 make -C zts install INSTALL_ROOT=%{buildroot}
 install -D -m 644 zts/%{ext_name}.ini %{buildroot}%{php_ztsinidir}/%{ext_name}.ini
+%endif
 
 # Install the admin stuff
 install -d -m 755 %{buildroot}%{_datadir}
@@ -140,8 +188,8 @@ mv %{buildroot}%{_datadir}/xcache/cacher/config.example.php \
 mv %{buildroot}%{_datadir}/xcache/coverager/config.example.php \
    %{buildroot}%{_sysconfdir}/xcache/coverager
 
-install -D -m 644 -p %{SOURCE1} \
-        %{buildroot}%{_sysconfdir}/httpd/conf.d/xcache.conf
+install -D -m 644 -p xcache-httpd.conf \
+        %{buildroot}%{_root_sysconfdir}/httpd/conf.d/xcache.conf
 
 
 %check
@@ -154,11 +202,12 @@ cd nts
     --modules | grep XCache
 
 # upstream unit tests
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
+TEST_PHP_EXECUTABLE=%{__php} \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-php run-tests.php -n -c xcache-test.ini tests
+%{__php} run-tests.php -n -c xcache-test.ini tests
 
+%if %{with_zts}
 cd ../zts
 %{__ztsphp} --no-php-ini \
     --define extension_dir=%{buildroot}%{php_ztsextdir}/\
@@ -169,52 +218,78 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
 %{__ztsphp} run-tests.php -n -c xcache-test.ini tests
+%endif
+
+
+%clean
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
 %doc nts/{AUTHORS,ChangeLog,COPYING,README,THANKS}
 %config(noreplace) %{php_inidir}/%{ext_name}.ini
-%config(noreplace) %{php_ztsinidir}/%{ext_name}.ini
 %{php_extdir}/%{ext_name}.so
+
+%if %{with_zts}
+%config(noreplace) %{php_ztsinidir}/%{ext_name}.ini
 %{php_ztsextdir}/%{ext_name}.so
+%endif
 
-%files -n xcache-admin
+%files -n %{?scl_prefix}xcache-admin
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/xcache.conf
+%config(noreplace) %{_root_sysconfdir}/httpd/conf.d/xcache.conf
 %{_datadir}/xcache
 # No real configuration files, only sample files
 %{_sysconfdir}/xcache
 
 
 %changelog
+* Thu Jan  9 2014 Remi Collet <remi@fedoraproject.org> - 3.1.0-2
+- adapt for SCL
+- drop conflicts with other opcode cache
+- disable opcode cache in provided configuration
+
+* Sat Oct 12 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
+- version 3.1.0
+
 * Sat Oct 12 2013 Remi Collet <remi@fedoraproject.org> - 3.0.4-1
 - version 3.0.4 (bugfixes)
 
 * Fri Jun 28 2013 Remi Collet <remi@fedoraproject.org> - 3.0.3-1
 - bump version, no change
 
+* Fri Jun 14 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.3.svn1268
+- latest changes from upstream
+
 * Fri Jun 14 2013 Remi Collet <remi@fedoraproject.org> - 3.0.2-1
 - bugfixes version
 
+* Tue May 14 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.2.svn1238
+- latest changes from upstream
+
+* Tue Apr 16 2013 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.1.svn1234
+- update to SVN snapshot for php 5.5 compatibility
+
 * Thu Jan 17 2013 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
 - bugfixes version
 
-* Sat Nov 22 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-1.1
+* Thu Nov 22 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-1.1
 - upstream have fixed the sources (review #859504)
 
+* Wed Oct 31 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-2
+- rebuild for remi repo
+
 * Wed Oct 31 2012 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
 - new major version
 - drop xcache-coverager subpackage
 - xcache-admin now provides cacher, coverager and diagnosis
 - run unit tests provided by upstream
 
-* Sat Oct 27 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-4
+* Sat Oct 27 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
 - drop php prefix from sub packages
-- clean EL-5 stuff
-
-* Fri Sep 21 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
-- prepare for review with EL-5 stuff
+- fix License
+- spec cleanups
 
 * Fri Sep 21 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
 - add admin and coverager sub-package
diff --git a/xcache-cacher.patch b/xcache-cacher.patch
new file mode 100644
index 0000000..a415114
--- /dev/null
+++ b/xcache-cacher.patch
@@ -0,0 +1,14 @@
+diff -up xcache-3.1.0/xcache.ini.old xcache-3.1.0/xcache.ini
+--- xcache-3.1.0/xcache.ini.old	2014-01-09 10:45:55.139937807 +0100
++++ xcache-3.1.0/xcache.ini	2014-01-09 10:47:44.972289458 +0100
+@@ -66,7 +66,9 @@ xcache.disable_on_crash =    Off
+ xcache.experimental =        Off
+ 
+ ; per request settings. can ini_set, .htaccess etc
+-xcache.cacher =               On
++; WARNING set xcache.cacher=On only when no other cache installed
++; Will create conflicts with php-opcache or php-pecl-zendopcache
++xcache.cacher =              Off
+ xcache.stat   =               On
+ xcache.optimizer =           Off
+