diff options
| -rw-r--r-- | php72.spec | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -124,7 +124,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -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 @@ -437,11 +437,6 @@ Requires: libtool %if %{with_libpcre} Requires: pcre-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} @@ -979,11 +974,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 @@ -1049,6 +1041,7 @@ Provides: php-pecl-json = %{jsonver} Provides: php-pecl-json%{?_isa} = %{jsonver} %if 0%{?rhel} Obsoletes: php53-json, php53u-json, php54-json, php54w-json, php55u-json, php55w-json, php56u-json, php56w-json +Obsoletes: php55u-pecl-jsonc, php56u-pecl-jsonc Obsoletes: php70u-json, php70w-json, php71u-json, php71w-json, php72u-json, php72w-json %endif @@ -2186,6 +2179,9 @@ fi %changelog +* Fri Feb 22 2019 Remi Collet <remi@remirepo.net> - 7.2.16~RC1-2 +- php-devel: drop dependency on libicu-devel + * Tue Feb 19 2019 Remi Collet <remi@remirepo.net> 7.2.16~RC1-1 - update to 7.2.16RC1 - adapt systzdata patch (v17) |