summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 10:57:04 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 10:57:04 +0200
commitf7be008f0141af1769f50e7a63bfcd23bfe94839 (patch)
treedf66601065a4c38f08c49a631393b21fa7346f77
parent202219fab1ba4085ed4d55f4007db249ba110a3c (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-krb5.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-krb5.spec b/php-pecl-krb5.spec
index 8b551fb..466e04f 100644
--- a/php-pecl-krb5.spec
+++ b/php-pecl-krb5.spec
@@ -25,7 +25,7 @@
Summary: Kerberos authentification extension
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.0
-Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -50,16 +50,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
@@ -224,6 +227,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.0-5
+- improve SCL build
+
* Mon Apr 14 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-4
- add numerical prefix to extension configuration file