diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-11-08 15:02:49 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-11-08 15:02:49 +0100 |
| commit | 36482c7c0f024f2c97f11b048b7bf5d929bf907e (patch) | |
| tree | 679b9a880b8886dc4d13ee5875da0d48deb56612 | |
| parent | 81b518d8b82500a36fc7387b9a02b493eb46e0a3 (diff) | |
php-pecl-http1: cleanups for Copr
| -rw-r--r-- | php-pecl-http1-dev.spec | 17 | ||||
| -rw-r--r-- | php-pecl-http1.spec | 11 |
2 files changed, 21 insertions, 7 deletions
diff --git a/php-pecl-http1-dev.spec b/php-pecl-http1-dev.spec index 71cc5ed..50a9a5b 100644 --- a/php-pecl-http1-dev.spec +++ b/php-pecl-http1-dev.spec @@ -6,11 +6,7 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-http1 -%else -%global pkg_name %{name} -%endif +%{?scl:%scl_package php-pecl-http1} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?php_incldir: %global php_incldir %{_includedir}/php} %{!?__php: %global __php %{_bindir}/php} @@ -24,7 +20,7 @@ # php-pecl-http exists and is version 2 Name: %{?scl_prefix}php-pecl-http1 Version: 1.7.6 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Extended HTTP support License: BSD @@ -50,12 +46,18 @@ Requires(post): %{__pecl} Requires(postun): %{__pecl} Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}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 +Requires: %{?scl_prefix}php-common%{?_isa} +%else Requires: %{?scl_prefix}php-hash%{?_isa} Requires: %{?scl_prefix}php-iconv%{?_isa} Requires: %{?scl_prefix}php-session%{?_isa} # From phpcompatinfo on the PHP extension (pgsql is optional) Requires: %{?scl_prefix}php-date%{?_isa} Requires: %{?scl_prefix}php-pcre%{?_isa} +%endif Requires: %{?scl_prefix}php-xmlrpc%{?_isa} # From upstream documentation @@ -243,6 +245,9 @@ rm -rf %{buildroot} %changelog +* Thu Nov 7 2013 Remi Collet <remi@fedoraproject.org> - 1.7.6-4 +- fix dependencies for EPEL-6 + * Tue Oct 22 2013 Remi Collet <remi@fedoraproject.org> - 1.7.6-3 - install doc in pecl doc_dir - install tests in pecl test_dir diff --git a/php-pecl-http1.spec b/php-pecl-http1.spec index bb3d746..5181b34 100644 --- a/php-pecl-http1.spec +++ b/php-pecl-http1.spec @@ -19,7 +19,7 @@ # php-pecl-http exists and is version 2 Name: php-pecl-http1 Version: 1.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Extended HTTP support License: BSD @@ -45,12 +45,18 @@ 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 +Requires: php-common%{?_isa} +%else Requires: php-hash%{?_isa} Requires: php-iconv%{?_isa} Requires: php-session%{?_isa} # From phpcompatinfo on the PHP extension (pgsql is optional) Requires: php-date%{?_isa} Requires: php-pcre%{?_isa} +%endif Requires: php-xmlrpc%{?_isa} # From upstream documentation @@ -238,6 +244,9 @@ rm -rf %{buildroot} %changelog +* Thu Nov 7 2013 Remi Collet <remi@fedoraproject.org> - 1.7.6-4 +- fix dependencies for EPEL-6 + * Tue Oct 22 2013 Remi Collet <remi@fedoraproject.org> - 1.7.6-3 - cleanups for review (drop SCL and EPEL-5 stuff) - install doc in pecl doc_dir |