summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 10:06:01 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 10:06:01 +0200
commit1d1ed3f17ec78caa116969df1276eea878c0353a (patch)
treeed0e02d45331bd4a9b512bca5e3f86bc660639b3
parent04fa51e1c8627fae160ce70ff778ca2c7baba442 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-newt.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-newt.spec b/php-pecl-newt.spec
index 4298142..bb34ac2 100644
--- a/php-pecl-newt.spec
+++ b/php-pecl-newt.spec
@@ -22,7 +22,7 @@
Summary: Extension for Red Hat Newt window library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.2.8
-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: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -43,16 +43,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
@@ -190,6 +193,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.2.8-4
+- improve SCL build
+
* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.2.8-3
- add numerical prefix to extension configuration file (php 5.6)