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
commit34aec09661fa78ec66cecfb5ffeb7b4e9384816f (patch)
tree906369d7dd2670ad6ce66fb35da37789e61ef262
parent322d54625576884a0c2f1eba6e6a06a9302cddde (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-ssdeep.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/php-pecl-ssdeep.spec b/php-pecl-ssdeep.spec
index cd9d461..5d39130 100644
--- a/php-pecl-ssdeep.spec
+++ b/php-pecl-ssdeep.spec
@@ -23,7 +23,7 @@
Summary: Wrapper for libfuzzy library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.4
-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}
@@ -44,14 +44,12 @@ 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}
Obsoletes: php54w-pecl-%{pecl_name}
-%endif
%if "%{php_version}" > "5.5"
Obsoletes: php55u-pecl-%{pecl_name}
Obsoletes: php55w-pecl-%{pecl_name}
@@ -209,6 +207,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.4-3
+- improve SCL build
+
* Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-2
- add numerical prefix to extension configuration file (php 5.6)