diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-08 15:53:57 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-08 15:53:57 +0100 |
| commit | 57b3988bd66e001a5725ece76ca50333bdcb7af2 (patch) | |
| tree | 28fc7d9a29c23a0dd24b9a22ab8f5b5ea35234d6 | |
| parent | ac2b5ff1df67995a7712115cd27192466ed0ae4c (diff) | |
php-pecl-solr2: F24
| -rw-r--r-- | php-pecl-solr2.spec | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 4a2625d..b172822 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -19,9 +19,6 @@ %endif %{?scl: %scl_package php-pecl-solr2} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global pecl_name solr #global prever b @@ -61,22 +58,22 @@ BuildRequires: pcre-devel 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-curl%{?_isa} Requires: %{?scl_prefix}php-json%{?_isa} -%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%if 0%{?fedora} < 25 # Only one version of the extension Conflicts: %{?sub_prefix}php-pecl-solr < 2 +%else +Obsoletes: %{?sub_prefix}php-pecl-solr < 2 +%endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} Obsoletes: php53-pecl-%{pecl_name}2 <= %{version} @@ -130,7 +127,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %setup -c -q # Don't install/register tests -sed -e 's/role="test"/role="src"/' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml mv %{pecl_name}-%{version}%{?prever} NTS @@ -193,6 +192,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -209,6 +209,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -287,6 +288,9 @@ rm -rf %{buildroot} %changelog +* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 2.3.0-2 +- adapt for F24 + * Wed Dec 2 2015 Remi Collet <remi@fedoraproject.org> - 2.3.0-1 - update to 2.3.0 (stable) |