From f69dd99da3a28a783ca52adba73b6191808ce300 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Feb 2019 09:41:26 +0100 Subject: php-devel: drop dependency on libicu-devel --- php73.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/php73.spec b/php73.spec index 3e88271..677ca85 100644 --- a/php73.spec +++ b/php73.spec @@ -125,7 +125,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -442,11 +442,6 @@ Requires: libtool %if %{with_libpcre} Requires: pcre2-devel%{?_isa} %endif -%if 0%{?rhel} == 6 -Requires: libicu-last-devel%{?_isa} -%else -Requires: libicu-devel%{?_isa} > 62 -%endif Obsoletes: php-pecl-pdo-devel Obsoletes: php-pecl-json-devel < %{jsonver} Obsoletes: php-pecl-jsonc-devel < %{jsonver} @@ -1011,11 +1006,8 @@ Group: System Environment/Libraries # All files licensed under PHP version 3.01 License: PHP Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} == 6 -BuildRequires: libicu-last-devel -%else -BuildRequires: libicu-devel > 62 -%endif +# Upstream requires 4.0, we require 50 to ensure use of libicu-last / libicu62 +BuildRequires: libicu-devel >= 50 %if 0%{?rhel} Obsoletes: php53-intl, php53u-intl, php54-intl, php54w-intl, php55u-intl, php55w-intl, php56u-intl, php56w-intl Obsoletes: php70u-intl, php70w-intl, php71u-intl, php71w-intl, php72u-intl, php72w-intl @@ -2215,6 +2207,9 @@ fi %changelog +* Fri Feb 22 2019 Remi Collet - 7.3.3~RC1-2 +- php-devel: drop dependency on libicu-devel + * Tue Feb 19 2019 Remi Collet - 7.3.3~RC1-1 - update to 7.3.3RC1 - adapt systzdata patch (v18) -- cgit