From 0170039520406d74b98ed1b20d4faeaf4f43ef58 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 17 Nov 2012 10:16:20 +0100 Subject: php-pecl-memcached: rebuild for libmemcached 1.0.14 with SASL support --- php-pecl-memcached.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'php-pecl-memcached.spec') diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index a83abc3..4d2e4c2 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -5,7 +5,7 @@ Summary: Extension to work with the Memcached caching daemon Name: php-pecl-memcached Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} # memcached is PHP, FastLZ is MIT License: PHP and MIT Group: Development/Languages @@ -14,8 +14,10 @@ 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 +# https://github.com/php-memcached-dev/php-memcached/commit/74542111f175fe2ec41c8bf722fc2cd3dac93eea.patch Patch0: %{pecl_name}-build.patch +# https://github.com/php-memcached-dev/php-memcached/pull/43 +Patch1: %{pecl_name}-info.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # 5.2.10 required to HAVE_JSON enabled @@ -24,7 +26,7 @@ BuildRequires: php-pear BuildRequires: php-pecl-igbinary-devel BuildRequires: libmemcached-devel >= 1.0.0 BuildRequires: zlib-devel -# BuildRequires: cyrus-sasl-devel +BuildRequires: cyrus-sasl-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} @@ -34,6 +36,8 @@ Requires: php-pecl-igbinary%{?_isa} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} @@ -91,17 +95,18 @@ EOF cd %{pecl_name}-%{version} %patch0 -p1 -b .build +%patch1 -p1 -b .info cd .. cp -r %{pecl_name}-%{version} %{pecl_name}-%{version}-zts %build -# no --enable-memcached-sasl, droped from libmemcached cd %{pecl_name}-%{version} %{_bindir}/phpize %configure --enable-memcached-igbinary \ --enable-memcached-json \ + --enable-memcached-sasl \ --with-php-config=%{_bindir}/php-config make %{?_smp_mflags} @@ -109,6 +114,7 @@ cd ../%{pecl_name}-%{version}-zts %{_bindir}/zts-phpize %configure --enable-memcached-igbinary \ --enable-memcached-json \ + --enable-memcached-sasl \ --with-php-config=%{_bindir}/zts-php-config make %{?_smp_mflags} @@ -175,6 +181,11 @@ ln -s %{php_ztsextdir}/igbinary.so modules/ %changelog +* Sat Nov 17 2012 Remi Collet - 2.1.0-5 +- rebuild for libmemcached 1.0.14 (with SASL) +- switch to upstream patch +- add patch to report about SASL support in phpinfo + * Fri Oct 19 2012 Remi Collet - 2.1.0-4 - improve comment in configuration about session. -- cgit