From c61de6773ed202d9b40a1f231dd7e4d74c2ed699 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Nov 2013 07:59:22 +0100 Subject: php-pecl-riak: missing BR pcre-devel --- php-pecl-riak.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/php-pecl-riak.spec b/php-pecl-riak.spec index f07b796..e64663b 100644 --- a/php-pecl-riak.spec +++ b/php-pecl-riak.spec @@ -6,8 +6,9 @@ # # Please, preserve the changelog entries # -%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}} -%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}} +%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} +%{!?__pecl: %global __pecl %{_bindir}/pecl} +%{!?__php: %global __php %{_bindir}/php} ############################# ## TODO ## @@ -22,7 +23,7 @@ Summary: Riak database PHP extension Name: php-pecl-%{pecl_name} Version: 0.7.0 -Release: 1%{?dist}%{!?nophptag:%(%{_bindir}/php -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 and BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -31,12 +32,18 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel > 5.3 BuildRequires: php-pear +BuildRequires: pcre-devel Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} +%if "%{php_version}" < "5.4" +# php 5.3.3 in EL-6 don't use arched virtual provides +# so only requires real packages instead +%else Requires: php-json%{?_isa} +%endif Provides: php-%{pecl_name} = %{version} Provides: php-%{pecl_name}%{?_isa} = %{version} @@ -197,6 +204,9 @@ rm -rf %{buildroot} %changelog +* Fri Nov 01 2013 Remi Collet - 0.7.0-2 +- missing BR pcre-devel + * Fri Nov 01 2013 Remi Collet - 0.7.0-1 - Update to 0.7.0 (beta) -- cgit