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
commitf2825e5582ac28a80d7d17c8bceedb8a9757405f (patch)
treea6750de44b976f4251889bcd49aea207c798d4be
parentcbbbb974ec4abe79eb00c004b17dcf82e4b79cc1 (diff)
php-pecl-* improve SCL build for 5.6 (wip)
-rw-r--r--php-pecl-haru.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/php-pecl-haru.spec b/php-pecl-haru.spec
index 778f217..8bb5dd9 100644
--- a/php-pecl-haru.spec
+++ b/php-pecl-haru.spec
@@ -22,7 +22,7 @@
Summary: Haru PDF functions
Name: %{?scl_prefix}php-pecl-haru
Version: 1.0.4
-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: PHP
Group: Development/Languages
@@ -48,16 +48,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
@@ -185,6 +188,9 @@ fi
%changelog
+* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.0.4-5
+- improve SCL build
+
* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-4
- add numerical prefix to extension configuration file