summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-26 08:36:36 +0200
commitd3a07e9a16363340e661dfb3ade5c15a8eddc722 (patch)
treeeb486fde687ea2beae6ea796103180001a9d6405
parent09819f9205af7e339e7107cfc8f4545258783244 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-ircclient.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-ircclient.spec b/php-pecl-ircclient.spec
index 46974fb..52816a2 100644
--- a/php-pecl-ircclient.spec
+++ b/php-pecl-ircclient.spec
@@ -22,7 +22,7 @@
Summary: IRC Client
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 0.3.0
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -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
@@ -176,6 +179,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 0.3.0-3
+- improve SCL build
+
* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 0.3.0-2
- add numerical prefix to extension configuration file