[php-pecl-memcached] update to 2.1.0

[Remi Collet]

commit ec178bff5842e2857707047310643c169522571a
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 18 19:10:39 2012 +0200

    update to 2.1.0

 .gitignore              |    2 ++
 memcached-build.patch   |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 php-pecl-memcached.spec |   33 ++++++++++++++++++---------------
 sources                 |    2 +-
 4 files changed, 67 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35608af..383573b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *spec~
+package*xml
 /memcached-2.0.0.tgz
 /memcached-2.0.1.tgz
+/memcached-2.1.0.tgz
diff --git a/memcached-build.patch b/memcached-build.patch
new file mode 100644
index 0000000..3b30972
--- /dev/null
+++ b/memcached-build.patch
@@ -0,0 +1,46 @@
+From a66b1286b06ec0c8b11790d772725a2a7bb33d57 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora at famillecollet.com>
+Date: Sat, 18 Aug 2012 18:57:39 +0200
+Subject: [PATCH] fix build with libmemcached < 1.0.10
+
+---
+ config.m4       |    2 ++
+ php_memcached.c |    6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/config.m4 b/config.m4
+index 045758a..a346d4c 100644
+--- a/config.m4
++++ b/config.m4
+@@ -250,6 +250,8 @@ if test "$PHP_MEMCACHED" != "no"; then
+     
+     PHP_MEMCACHED_FILES="php_memcached.c fastlz/fastlz.c g_fmt.c"
+ 
++    AC_CHECK_LIB(memcached, memcached_server_major_version, AC_DEFINE(HAVE_MEMCACHED_SERVER_VERSION, 1, [Whether libmemcached have memcached_server_xxx_version functions]))
++
+     if test "$PHP_MEMCACHED_SESSION" != "no"; then
+       PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_session.c"
+     fi
+diff --git a/php_memcached.c b/php_memcached.c
+index 90ea8ab..3f3882a 100644
+--- a/php_memcached.c
++++ b/php_memcached.c
+@@ -2643,9 +2643,15 @@ static memcached_return php_memc_do_version_callback(const memcached_st *ptr, me
+ 
+ 	hostport_len = spprintf(&hostport, 0, "%s:%d", memcached_server_name(instance), memcached_server_port(instance));
+ 	version_len = snprintf(version, sizeof(version), "%d.%d.%d",
++#ifdef HAVE_MEMCACHED_SERVER_VERSION
+ 				memcached_server_major_version(instance),
+ 				memcached_server_minor_version(instance),
+ 				memcached_server_micro_version(instance));
++#else
++				instance->major_version,
++				instance->minor_version,
++				instance->micro_version);
++#endif
+ 
+ 	add_assoc_stringl_ex(context->return_value, hostport, hostport_len+1, version, version_len, 1);
+ 	efree(hostport);
+-- 
+1.7.10
+
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 2103eba..d8751bb 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -1,28 +1,28 @@
 %{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
 
 %global pecl_name memcached
-#global gitver    1736623
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         php-pecl-memcached
-Version:      2.0.1
-%if 0%{?gitver:1}
-Release:      0.2.git%{gitver}%{?dist}
-Source:       php-memcached-dev-php-memcached-v2.0.0b2-14-g%{gitver}.tar.gz
-%else
-Release:      4%{?dist}
-Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-%endif
+Version:      2.1.0
+Release:      1%{?dist}
 # memcached is PHP, FastLZ is MIT
 License:      PHP and MIT
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/%{pecl_name}
 
+Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+
+# https://github.com/php-memcached-dev/php-memcached/issues/25
+# https://github.com/remicollet/php-memcached/commit/a66b1286b06ec0c8b11790d772725a2a7bb33d57.patch
+Patch0:        %{pecl_name}-build.patch
+
+
 # 5.2.10 required to HAVE_JSON enabled
 BuildRequires: php-devel >= 5.2.10
 BuildRequires: php-pear
 BuildRequires: php-pecl-igbinary-devel
-BuildRequires: libmemcached-devel
+BuildRequires: libmemcached-devel >= 1.0.0
 BuildRequires: zlib-devel
 BuildRequires: cyrus-sasl-devel
 
@@ -59,11 +59,6 @@ It also provides a session handler (memcached).
 %prep 
 %setup -c -q
 
-%if 0%{?gitver:1}
-mv php-memcached-dev-php-memcached-%{gitver}/package.xml .
-mv php-memcached-dev-php-memcached-%{gitver} %{pecl_name}-%{version}
-%endif
-
 # Chech version as upstream often forget to update this
 extver=$(sed -n '/#define PHP_MEMCACHED_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_memcached.h)
 if test "x${extver}" != "x%{version}"; then
@@ -86,6 +81,10 @@ extension=%{pecl_name}.so
 ;session.save_path="localhost:11211"
 EOF
 
+cd %{pecl_name}-%{version}
+%patch0 -p1 -b .build
+cd ..
+
 cp -r %{pecl_name}-%{version} %{pecl_name}-%{version}-zts
 
 
@@ -176,6 +175,10 @@ ln -s %{php_ztsextdir}/igbinary.so modules/
 
 
 %changelog
+* Tue Aug 07 2012 Remi Collet <remi at fedoraproject.org> - 2.1.0-1
+- update to 2.1.0
+- add patch to lower libmemcached required version
+
 * Tue Jul 31 2012 Remi Collet <remi at fedoraproject.org> - 2.0.1-4
 - bump release
 
diff --git a/sources b/sources
index f2e48d5..066a6bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f81a5261be1c9848ed5c071a4ebe5e05  memcached-2.0.1.tgz
+daf070aad13bebffdff50acf6e93043c  memcached-2.1.0.tgz