summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-25 08:07:11 +0200
commit1c4972d53515185d7e08e6176af9c24bbe2c1b0b (patch)
tree995b5f5118487c8734f0c9b9610c0977d983eebd
parenta2bde843b760aeb399fbe929927ae0f6f7f7bd6d (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-fann.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/php-pecl-fann.spec b/php-pecl-fann.spec
index 33c0473..6c70ead 100644
--- a/php-pecl-fann.spec
+++ b/php-pecl-fann.spec
@@ -23,7 +23,7 @@
Summary: Wrapper for FANN Library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.0.7
-Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
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
Obsoletes: php53-pecl-%{pecl_name}
Obsoletes: php53u-pecl-%{pecl_name}
-%if "%{php_version}" > "5.4"
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}
@@ -205,6 +203,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 1.0.7-4
+- improve SCL build
+
* Fri Aug 1 2014 Remi Collet <remi@fedoraproject.org> - 1.0.7-3
- don't install tests
- fix license handling