summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 21:59:14 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 21:59:14 +0200
commitddacb7675bf9a43ff86e0aac820d5f793acec246 (patch)
treec4b9362f6ea458eadd1c044e0cbcd261347528fb
parentd6c0d33e6110f195ec8cae03fc967fdc9283d4d1 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-yaml.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec
index 5ea2fd3..eba51dd 100644
--- a/php-pecl-yaml.spec
+++ b/php-pecl-yaml.spec
@@ -25,7 +25,7 @@
Summary: PHP Bindings for yaml
Name: %{?scl_prefix}php-pecl-yaml
Version: 1.1.1
-Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: MIT
Group: Development/Languages
URL: http://pecl.php.net/package/yaml
@@ -47,16 +47,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
@@ -222,6 +225,9 @@ fi
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.1.1-4
+- improve SCL build
+
* Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 1.1.1-3
- add numerical prefix to extension configuration file (php 5.6)