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
commitb1f430a0e0242246a16a061a98c681793f074367 (patch)
treeb9e5e4708d5a5adb5d6aec81cb98547a796cdfbf
parent8907f34076c4698469c0de827c0937fdd71dcffe (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-uuid.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-uuid.spec b/php-pecl-uuid.spec
index c8e9809..878a562 100644
--- a/php-pecl-uuid.spec
+++ b/php-pecl-uuid.spec
@@ -22,7 +22,7 @@
Summary: Universally Unique Identifier extension for PHP
Name: %{?scl_prefix}php-pecl-uuid
Version: 1.0.3
-Release: 9%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 10%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: LGPLv2+
Group: Development/Languages
URL: http://pecl.php.net/package/uuid
@@ -58,18 +58,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
@@ -206,6 +207,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.3-10
+- improve SCL build
+
* Thu Apr 10 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-9
- add numerical prefix to extension configuration file