diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-03-24 15:58:53 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-03-24 15:58:53 +0100 |
| commit | 96188b750f0d736fd244e0a0cf13e82e4c40f31a (patch) | |
| tree | 36835f70020487469373fdee4d46163f5af6c0bf | |
| parent | 712cab420ca7727c7cc1811253da11b52737ae7d (diff) | |
php-pecl-memcached: allow SCL build with libevent + libmemcached from SCL
| -rw-r--r-- | php-pecl-memcached.spec | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index bc9be21..e4e13d8 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -20,7 +20,7 @@ %global intver rc1 Summary: Extension to work with the Memcached caching daemon -Name: php-pecl-memcached +Name: %{?scl_prefix}php-pecl-memcached Version: 2.2.0 Release: 0.3.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} # memcached is PHP, FastLZ is MIT @@ -37,10 +37,9 @@ BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-pecl-igbinary-devel BuildRequires: %{?scl_prefix}php-pecl-msgpack-devel -BuildRequires: libmemcached-devel >= 1.0.0 BuildRequires: zlib-devel BuildRequires: cyrus-sasl-devel -%if %{with_test} +%if %{with_tests} BuildRequires: memcached %endif @@ -48,13 +47,12 @@ BuildRequires: memcached # Filter in the SCL collection %{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so} # libvent from SCL as not available in system -BuildRequires: %{?scl_prefix}libevent-devel >= 2 -Requires: %{?scl_prefix}libevent%{_isa} >= 2 -Requires: libmemcached%{_isa >= 1.0.0 -%global _event_prefix %{_prefix} +BuildRequires: %{?scl_prefix}libevent-devel > 2 +Requires: %{?scl_prefix}libevent%{_isa} > 2 +BuildRequires: %{?scl_prefix}libmemcached-devel > 1 +Requires: %{?scl_prefix}libmemcached-libs%{_isa} > 1 %else BuildRequires: libevent-devel >= 2.0.2 -%global _event_prefix %{_root_prefix} %endif Requires(post): %{__pecl} @@ -136,6 +134,7 @@ cp -r NTS ZTS %build +# only needed for SCL export PKG_CONFIG_PATH=%{_libdir}/pkgconfig peclconf() { |