From ae08082c2966a1b4ea5d006e259997d20196ab65 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Nov 2018 12:20:33 +0100 Subject: rebuild using libmemcached-opt for EL --- php-pecl-memcached.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'php-pecl-memcached.spec') diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 58b0ff0..add4c0c 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -31,7 +31,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached Version: 3.0.4 -Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: http://pecl.php.net/package/%{pecl_name} @@ -60,8 +60,16 @@ BuildRequires: memcached %endif BuildRequires: pkgconfig(libevent) >= 2.0.2 -# To ensure use of libmemcached-last for --enable-memcached-protocol -BuildRequires: pkgconfig(libmemcached) >= 1.0.16 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 +%global move_to_opt 1 +BuildRequires: libmemcached-opt-devel >= 1.0.18 +Requires: fastlz%{?_isa} +Requires: cyrus-sasl-lib%{?_isa} +Requires: libmemcached-opt-libs%{?_isa} +%else +%global move_to_opt 0 +BuildRequires: pkgconfig(libmemcached) >= 1.0.18 +%endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -112,8 +120,11 @@ Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter private shared %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif +%if %{move_to_opt} +%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so$} +%endif +%{?filter_setup} %description @@ -187,8 +198,9 @@ cp -r NTS ZTS %build %{?dtsenable} -# only needed for SCL -export PKG_CONFIG_PATH=%{_libdir}/pkgconfig +%if %{move_to_opt} +export PKG_CONFIG_PATH=/opt/libmemcached/%{_lib}/pkgconfig +%endif peclconf() { %configure \ @@ -344,6 +356,9 @@ exit $ret %changelog +* Tue Nov 20 2018 Remi Collet - 3.0.4-8 +- rebuild using libmemcached-opt for EL + * Thu Aug 16 2018 Remi Collet - 3.0.4-7 - rebuild for 7.3.0beta2 new ABI -- cgit