summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-22 09:24:09 +0100
committerRemi Collet <remi@remirepo.net>2019-02-22 09:24:09 +0100
commitc236858ac36ec22a0bb9a1aa3af67597aed4b65c (patch)
tree0518cdfbd7dcc04152979a7029e5124a59521854
parentd13a0caa68fe3e2bb7c9dc23457c93565707ad30 (diff)
php-devel: drop dependency on libicu-devel
-rw-r--r--php.spec17
1 files changed, 6 insertions, 11 deletions
diff --git a/php.spec b/php.spec
index 20b8455..10fa93c 100644
--- a/php.spec
+++ b/php.spec
@@ -135,7 +135,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}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
@@ -417,11 +417,6 @@ Requires: libtool
%if %{with_libpcre}
Requires: pcre-devel%{?_isa} >= 8.20
%endif
-%if 0%{?rhel} == 6
-Requires: libicu-last-devel%{?_isa}
-%else
-Requires: libicu-devel%{?_isa} > 62
-%endif
%description devel
The %{?scl_prefix}php-devel package contains the files needed for building PHP
@@ -839,11 +834,8 @@ Group: System Environment/Libraries
# All files licensed under PHP version 3.01
License: PHP
Requires: %{?scl_prefix}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
%description intl
The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -1892,6 +1884,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)