summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
commit762923a476539d3630f11b75120402440719e3de (patch)
tree18fc5c94a4b15082764673aa7137b17803ff0d61
parentce4fdedfe62583484334b987e57c548f302d0812 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-raphf.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec
index b02b960..7cf16c3 100644
--- a/php-pecl-raphf.spec
+++ b/php-pecl-raphf.spec
@@ -26,7 +26,7 @@
Summary: Resource and persistent handles factory
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.4
-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: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -49,18 +49,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
-%if "%{php_version}" > "5.4"
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
Obsoletes: php54-pecl-%{pecl_name}
-%endif
+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
@@ -235,6 +236,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.4-4
+- improve SCL build
+
* Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-3
- add numerical prefix to extension configuration file