summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 16:25:54 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 16:25:54 +0200
commita6c611eb38e8c64957f1dc5751959e1b93c7c3f4 (patch)
tree01736827234c3c250600a964a0689a114fc9dde4
parent3c11801e4ebad174c3443c481cf8de448152b2f2 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-solr.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec
index 981be2d..09c232c 100644
--- a/php-pecl-solr.spec
+++ b/php-pecl-solr.spec
@@ -26,7 +26,7 @@ Summary: Object oriented API to Apache Solr
Summary(fr): API orientée objet pour Apache Solr
Name: %{?scl_prefix}php-pecl-solr
Version: 1.1.1
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/solr
@@ -59,7 +59,7 @@ 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}
-%if "%{?vendor}" == "Remi Collet"
+%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
@@ -260,6 +260,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.1-2
+- improve SCL build
+
* Fri Jun 20 2014 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
- Update to 1.1.1 (stable)