From 42bb333a550d9bda2492d0cf7ed66bcdc35e569d Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 27 Jul 2013 14:02:05 +0200
Subject: php-pecl-apcu: restore APC serializers ABI

---
 php-pecl-apcu.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'php-pecl-apcu.spec')

diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec
index d708cc8..0e192ce 100644
--- a/php-pecl-apcu.spec
+++ b/php-pecl-apcu.spec
@@ -19,6 +19,10 @@ Source1:        %{pecl_name}.ini
 Source2:        %{pecl_name}-panel.conf
 Source3:        %{pecl_name}.conf.php
 
+# Restore APC serializers ABI (merged upstream)
+# https://github.com/krakjoe/apcu/pull/25
+Patch0:         %{pecl_name}-git.patch
+
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/APCu
@@ -38,7 +42,7 @@ Provides:       php-apcu%{?_isa} = %{version}
 Provides:       php-pecl(apcu) = %{version}
 Provides:       php-pecl(apcu)%{?_isa} = %{version}
 %if "%{php_version}" < "5.5"
-Conflicts:      php-pecl-apc
+Conflicts:      php-pecl-apc < 4
 %else
 Obsoletes:      php-pecl-apc < 4
 %endif
@@ -82,7 +86,7 @@ Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      php-devel%{?_isa}
 %if "%{php_version}" < "5.5"
-Conflicts:      php-pecl-apc-devel
+Conflicts:      php-pecl-apc-devel < 4
 %else
 Obsoletes:      php-pecl-apc-devel < 4
 Provides:       php-pecl-apc-devel = %{version}-%{release}
@@ -102,7 +106,7 @@ BuildArch:     noarch
 Requires:      %{name} = %{version}-%{release}
 Requires:      mod_php, httpd, php-gd
 %if "%{php_version}" < "5.5"
-Conflicts:      apc-panel
+Conflicts:      apc-panel < 4
 %else
 Obsoletes:      apc-panel < 4
 Provides:       apc-devel = %{version}-%{release}
@@ -118,6 +122,7 @@ configuration, available on http://localhost/apcu-panel/
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
+%patch0 -p1 -b .serializers
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_APC_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
@@ -237,6 +242,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Jul  4 2013 Remi Collet <remi@fedoraproject.org> - 4.0.1-2
 - obsoletes APC with php 5.5
+- restore APC serializers ABI (patch merged upstream)
 
 * Tue Apr 30 2013 Remi Collet <remi@fedoraproject.org> - 4.0.1-1
 - Update to 4.0.1
-- 
cgit