[php-pecl-apc] update to 3.1.10 (official upstream beta version for php 5.4)

[Remi Collet]

commit 30c92baac5a05eeeabf696688e4f6b4562d6edfd
Author: remi <fedora at famillecollet.com>
Date:   Wed Apr 11 19:04:51 2012 +0200

    update to 3.1.10 (official upstream beta version for php 5.4)

 .gitignore        |    1 +
 php-pecl-apc.spec |   31 +++++++++++++++----------------
 sources           |    2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 84f5f77..84859e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /apc-svn316786.tgz
 /apc-svn322617.tgz
 /apc-svn324146.tgz
+/APC-3.1.10.tgz
diff --git a/php-pecl-apc.spec b/php-pecl-apc.spec
index 7c25670..408cfb7 100644
--- a/php-pecl-apc.spec
+++ b/php-pecl-apc.spec
@@ -3,23 +3,16 @@
 %global php_zendabiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP Extension => //p') | tail -1)
 
 %global pecl_name APC
-%global svnver    324146
 
 Summary:       APC caches and optimizes PHP intermediate code
 Name:          php-pecl-apc
-Version:       3.1.9
+Version:       3.1.10
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/APC
-%if 0%{?svnver}
-# svn export -r 324146 https://svn.php.net/repository/pecl/apc/trunk apc-svn324146
-# tar czf apc-svn324146.tgz apc-svn324146
-Source:        apc-svn%{svnver}.tgz
-Release:       6.svn%{svnver}%{?dist}
-%else
-Release:       3%{?dist}
 Source:        http://pecl.php.net/get/APC-%{version}.tgz
-%endif
+
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 Conflicts:     php-mmcache php-eaccelerator
@@ -64,13 +57,15 @@ These are the files needed to compile programs using APC serializer.
 %prep
 %setup -q -c 
 
-%if 0%{?svnver}
-mv apc-svn%{svnver}/package.xml .
-mv apc-svn%{svnver} APC-%{version}
-%endif
+# https://bugs.php.net/61696
+sed -i -e 's/"3.1.9"/"%{version}"/' APC-%{version}/php_apc.h
 
-# Check than upstream version is correct, http://pecl.php.net/bugs/19590
-grep '"%{version}"' APC-%{version}/php_apc.h || exit 1
+# Sanity check, really often broken
+extver=$(sed -n '/#define PHP_APC_VERSION/{s/.* "//;s/".*$//;p}' APC-%{version}/php_apc.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}.
+   exit 1
+fi
 
 %if 0%{?__ztsphp:1}
 # duplicate for ZTS build
@@ -243,6 +238,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 11 2012 Remi Collet <remi at fedoraproject.org> - 3.1.10-1
+- Update to 3.1.10 (beta)
+- fix reported version, https://bugs.php.net/61696
+
 * Thu Mar 15 2012 Remi Collet <remi at fedoraproject.org> - 3.1.9-6.svn324146
 - new SVN snapshot
 - enable ZTS build
diff --git a/sources b/sources
index 506128f..24e99d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2937b6ccacec30c0762f11f5e18939b5  apc-svn324146.tgz
+f4a6b91903d6ba9dce89fc87bb6f26c9  APC-3.1.10.tgz