summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
commit398f3df72ad617840f1ea3a64f9acc209edb1fb1 (patch)
treeffc9868f166db7fc76c9194031bb23d5a6192af7
parent2394031c87e56a9884bc7a48643dfeec67f17786 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-chdb.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-chdb.spec b/php-pecl-chdb.spec
index f94f1b8..25aed44 100644
--- a/php-pecl-chdb.spec
+++ b/php-pecl-chdb.spec
@@ -22,7 +22,7 @@
Summary: A fast database for constant data
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.3
-Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -44,16 +44,19 @@ 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}
Obsoletes: php54-pecl-%{pecl_name}
+Obsoletes: php54w-pecl-%{pecl_name}
%if "%{php_version}" > "5.5"
Obsoletes: php55u-pecl-%{pecl_name}
+Obsoletes: php55w-pecl-%{pecl_name}
%endif
%if "%{php_version}" > "5.6"
Obsoletes: php56u-pecl-%{pecl_name}
+Obsoletes: php56w-pecl-%{pecl_name}
%endif
%endif
@@ -203,6 +206,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.0.3-5
+- improve SCL build
+
* Tue Apr 15 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-4
- add numerical prefix to extension configuration file