summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-11-15 14:52:39 +0100
committerRemi Collet <fedora@famillecollet.com>2013-11-15 14:52:39 +0100
commitaf1414fa347475cf7424b601f30d1777378e8cf9 (patch)
treed0f0d73b20b0d4d15fb5e182d7bbffa35728ce61
parent23883fcf2756a33eea9febbab33825c30e478cd2 (diff)
php-pecl-memcached: rebuild
-rw-r--r--php-pecl-memcached.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index c112975..38ea1aa 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -1,4 +1,5 @@
-%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
+%{!?__pecl: %global __pecl %{_bindir}/pecl}
+%{!?__php: %global __php %{_bindir}/php}
%global pecl_name memcached
%global libmemcached_build_version %(pkg-config --silence-errors --modversion libmemcached 2>/dev/null || echo 65536)
@@ -6,7 +7,7 @@
Summary: Extension to work with the Memcached caching daemon
Name: php-pecl-memcached
Version: 2.1.0
-Release: 6%{?dist}.5
+Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
# memcached is PHP, FastLZ is MIT
License: PHP and MIT
Group: Development/Languages
@@ -32,7 +33,6 @@ BuildRequires: cyrus-sasl-devel
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
-Requires: libmemcached%{?_isa} >= %{libmemcached_build_version}
Requires: php-pecl-igbinary%{?_isa}
Requires: php(zend-abi) = %{php_zend_api}
Requires: php(api) = %{php_core_api}
@@ -45,16 +45,16 @@ Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}
# Other third party repo stuff
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
-%if "%{php_version}" > "5.4"
Obsoletes: php54-pecl-%{pecl_name}
-%endif
%if "%{php_version}" > "5.5"
-Obsoletes: php55-pecl-%{pecl_name}
+Obsoletes: php55u-pecl-%{pecl_name}
%endif
+%if 0%{?fedora} < 20
# Filter private shared
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
+%endif
%description
@@ -185,6 +185,10 @@ ln -s %{php_ztsextdir}/igbinary.so modules/
%changelog
+* Fri Nov 15 2013 Remi Collet <remi@fedoraproject.org> - 2.1.0-7
+- drop requires libmemcached >= build version
+ as this can also be libmemcached-last
+
* Mon Nov 19 2012 Remi Collet <remi@fedoraproject.org> - 2.1.0-6
- requires libmemcached >= build version