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
commit54b1b9a57007a33fcc25b6c14a6b2b6ea9ce7fa7 (patch)
tree6cc13e9d7f10a36a80beabf90dcbcb36f99d8886
parentfd47360e4ca584f50d2b6c793c17e8e4dc3fabd1 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-mosquitto.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/php-pecl-mosquitto.spec b/php-pecl-mosquitto.spec
index 6cdf275..fbd3374 100644
--- a/php-pecl-mosquitto.spec
+++ b/php-pecl-mosquitto.spec
@@ -23,7 +23,7 @@
Summary: Extension for libmosquitto
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.2.2
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{proj_name}
@@ -44,18 +44,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
@@ -182,6 +183,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.2.2-2
+- improve SCL build
+
* Tue May 13 2014 Remi Collet <remi@fedoraproject.org> - 0.2.2-1
- Update to 0.2.2 (alpha)