diff options
| -rw-r--r-- | memcached-pr2.patch | 22 | ||||
| -rw-r--r-- | php-pecl-memcached-dev.spec | 15 |
2 files changed, 7 insertions, 30 deletions
diff --git a/memcached-pr2.patch b/memcached-pr2.patch deleted file mode 100644 index 08f0142..0000000 --- a/memcached-pr2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 650b67c64ca8ac8bd140492fd1078015cb8eaa0b Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@famillecollet.com> -Date: Sat, 27 Jun 2015 18:28:31 +0200 -Subject: [PATCH] Update php_memcached.c - ---- - php_memcached.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/php_memcached.c b/php_memcached.c -index 1063b22..9195bfc 100644 ---- a/php_memcached.c -+++ b/php_memcached.c -@@ -3119,7 +3119,7 @@ zend_bool s_serialize_value (enum memcached_serializer serializer, zval *value, - #ifdef HAVE_MEMCACHED_MSGPACK - case SERIALIZER_MSGPACK: - php_msgpack_serialize(buf, value); -- if (!buf->c) { -+ if (!buf->s) { - php_error_docref(NULL, E_WARNING, "could not serialize value with msgpack"); - return 0; - } diff --git a/php-pecl-memcached-dev.spec b/php-pecl-memcached-dev.spec index 6f1cfd4..a3bd5d5 100644 --- a/php-pecl-memcached-dev.spec +++ b/php-pecl-memcached-dev.spec @@ -28,9 +28,9 @@ %global with_zts 0%{?__ztsphp:1} %global with_tests %{?_with_tests:1}%{!?_with_tests:0} %global pecl_name memcached -%global gh_commit 4187e2277fa7469b0b8a67045083dde1950cecc0 +%global gh_commit 3c79a97aeb6e8c946116c536831816a36eb4eb0f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20150423 +%global gh_date 20150628 #global gh_owner php-memcached-dev # Temporarily use Rasmus fork %global gh_owner rlerdorf @@ -48,15 +48,12 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 2.2.0 -Release: 7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 8.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}.tar.gz - -# https://github.com/rlerdorf/php-memcached/pull/2 -Patch0: %{pecl_name}-pr2.patch +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # 5.2.10 required to HAVE_JSON enabled @@ -162,7 +159,6 @@ mv NTS/package.xml . sed -e 's/role="test"/role="src"/' -i package.xml cd NTS -%patch0 -p1 -b .fastlz %if %{with_fastlz} rm -r fastlz @@ -360,6 +356,9 @@ exit $ret %changelog +* Wed Jul 8 2015 Remi Collet <rcollet@redhat.com> - 2.2.0-8.20150628git3c79a97 +- new snapshot + * Sat Jun 27 2015 Remi Collet <rcollet@redhat.com> - 2.2.0-7.20150423git4187e22 - switch sources from pecl to github - temporarily use rlerdorf fork (php7 compatibility) |