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
commitab3187ac09b808a14d115057f8708d9981306a32 (patch)
tree02d6e8fc48c8ba0da9c7c62a05b3cfb6313f7b11
parentb4115dc2ac5b2b55bd3683c51ac15a953a6d2ba8 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-inclued.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-inclued.spec b/php-pecl-inclued.spec
index 5184567..d1e2a54 100644
--- a/php-pecl-inclued.spec
+++ b/php-pecl-inclued.spec
@@ -22,7 +22,7 @@
Summary: Clued-in about your inclueds
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.1.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}
@@ -51,16 +51,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
@@ -207,6 +210,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.1.3-5
+- improve SCL build
+
* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 0.1.3-4
- add numerical prefix to extension configuration file