From b813b111de6a3650e2eeaca6a1783fc321c0ae94 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2013 16:15:44 +0100 Subject: php 5.5: define php_bootstrap for simplicity --- php55.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/php55.spec b/php55.spec index 88224ed..4323da1 100644 --- a/php55.spec +++ b/php55.spec @@ -6,6 +6,9 @@ %global opcachever 7.0.3-dev %global oci8ver 1.4.10 +# Use for first build of PHP (before pecl/zip and pecl/jsonc) +%global php_bootstrap 0 + # Adds -z now to the linker flags %global _hardened_build 1 @@ -316,14 +319,17 @@ Provides: php-sockets, php-sockets%{?_isa} Provides: php-spl, php-spl%{?_isa} Provides: php-standard = %{version}, php-standard%{?_isa} = %{version} Provides: php-tokenizer, php-tokenizer%{?_isa} -# Temporary circular dep (to remove for bootstrap) +%if ! %{php_bootstrap} Requires: php-pecl-jsonc%{?_isa} +%endif %if %{with_zip} Provides: php-zip, php-zip%{?_isa} Obsoletes: php-pecl-zip < 1.11 %else +%if ! %{php_bootstrap} Requires: php-pecl-zip%{?_isa} %endif +%endif Provides: php-zlib, php-zlib%{?_isa} Obsoletes: php-pecl-phar < 1.2.4 Obsoletes: php-pecl-Fileinfo < 1.0.5 @@ -348,8 +354,9 @@ Provides: php-zts-devel = %{version}-%{release} Provides: php-zts-devel%{?_isa} = %{version}-%{release} %endif Obsoletes: php53-devel, php53u-devel, php54-devel, php55-devel -# Temporary circular dep (to remove for bootstrap) +%if ! %{php_bootstrap} Requires: php-pecl-jsonc-devel%{?_isa} +%endif %description devel The php-devel package contains the files needed for building PHP -- cgit