[php-xcache] update to SVN snapshot for php 5.5 compatibility

[Remi Collet]

commit 607bf34130461096ea9cbece14feea07a9ec654a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Apr 16 14:26:56 2013 +0200

    update to SVN snapshot for php 5.5 compatibility

 .gitignore      |    1 +
 php-xcache.spec |   25 ++++++++++++++++++-------
 sources         |    2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77ee528..310f7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *spec~
 /xcache-3.0.0.tar.gz
 /xcache-3.0.1.tar.gz
+/xcache-svn1234.tgz
diff --git a/php-xcache.spec b/php-xcache.spec
index fa20a7a..871f6e5 100644
--- a/php-xcache.spec
+++ b/php-xcache.spec
@@ -1,15 +1,23 @@
+%{!?php_inidir: %{expand: %%global php_inidir  %{_sysconfdir}/php.d}}
 %global ext_name     xcache
 %global with_zts     0%{?__ztsphp:1}
+%global svnrev       1234
 
 Summary:       Fast, stable PHP opcode cacher
 Name:          php-xcache
-Version:       3.0.1
-Release:       2%{?dist}
+Version:       3.1.0
+Release:       0.1.svn%{svnrev}%{?dist}
 License:       BSD
 Group:         Development/Languages
 URL:           http://xcache.lighttpd.net/
 
+%if 0%{?svnrev}
+# svn co -r 1234 svn://svn.lighttpd.net/xcache/trunk xcache-3.1.0
+# tar czf xcache-svn1234.tgz xcache-3.1.0
+Source0:       xcache-svn1234.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
@@ -21,7 +29,7 @@ Requires:      php(zend-abi) = %{php_zend_api}
 Requires:      php(api) = %{php_core_api}
 
 # Only one opcode cache can be installed
-Conflicts:     php-pecl-apc
+Conflicts:     php-pecl-apc < 3.1.15
 Conflicts:     php-eaccelerator
 
 # Filter private shared object
@@ -68,8 +76,8 @@ cd nts
 
 # 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 ..
@@ -110,7 +118,7 @@ make %{?_smp_mflags}
 %install
 # Install the NTS stuff
 make -C nts install INSTALL_ROOT=%{buildroot}
-install -D -m 644 nts/%{ext_name}.ini %{buildroot}%{_sysconfdir}/php.d/%{ext_name}.ini
+install -D -m 644 nts/%{ext_name}.ini %{buildroot}%{php_inidir}/%{ext_name}.ini
 
 %if %{with_zts}
 # Install the ZTS stuff
@@ -165,7 +173,7 @@ REPORT_EXIT_STATUS=1 \
 
 %files
 %doc nts/{AUTHORS,ChangeLog,COPYING,README,THANKS}
-%config(noreplace) %{_sysconfdir}/php.d/%{ext_name}.ini
+%config(noreplace) %{php_inidir}/%{ext_name}.ini
 %{php_extdir}/%{ext_name}.so
 
 %if %{with_zts}
@@ -181,6 +189,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Apr 16 2013 Remi Collet <remi at fedoraproject.org> - 3.1.0-0.1.svn1234
+- update to SVN snapshot for php 5.5 compatibility
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 19048c2..7da3d0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46b33bc04bbf8a5d1615e7235e8b84d5  xcache-3.0.1.tar.gz
+13e4729840e45a513c33896938090ec4  xcache-svn1234.tgz