From 33257f863e586e3b19b7cfb8ea0dba6a7f2c64f5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jun 27 2016 15:43:34 +0000 Subject: rebuild for https://fedoraproject.org/wiki/Changes/php70 --- diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index da23cbf..d0b27c3 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -20,7 +20,7 @@ Summary: Object oriented API to Apache Solr Name: php-pecl-solr2 Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/solr @@ -44,7 +44,8 @@ Provides: php-%{pecl_name} = %{version} Provides: php-%{pecl_name}%{?_isa} = %{version} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} -%if 0%{?fedora} < 25 + +%if "%{php_version}" < "7.0" # Only one version of the extension Conflicts: php-pecl-solr < 2 %else @@ -75,7 +76,7 @@ Please consult the documentation for more details on features. http://php.net/solr Warning: PECL Solr 2 is not compatible with Solr Server < 4.0 -%if 0%{?fedora} < 25 +%if "%{php_version}" < "7.0" PECL Solr 1 is available in php-pecl-solr package. %endif @@ -211,6 +212,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Mon Jun 27 2016 Remi Collet - 2.4.0-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php70 + * Wed Mar 30 2016 Remi Collet - 2.4.0-1 - update to 2.4.0 (stable)