[packages/php/dev-7.3: 5/6] uses pcre2 >= 10.30

glen glen at pld-linux.org
Mon Jul 16 07:02:36 CEST 2018


commit 25f20eda810aebf1ad853ddf997d287fdfbb680f
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Jul 10 11:12:45 2018 +0300

    uses pcre2 >= 10.30

 php.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index d92153d..68f4637 100644
--- a/php.spec
+++ b/php.spec
@@ -275,7 +275,7 @@ BuildRequires:	openssl-devel >= 1.0.1
 %endif
 %{?with_oci:%{?with_instantclient:BuildRequires:	oracle-instantclient-devel}}
 BuildRequires:	pam-devel
-%{?with_pcre:BuildRequires:	pcre-devel >= 8.10}
+%{?with_pcre:BuildRequires:	pcre2-8-devel >= 10.30}
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
@@ -577,7 +577,7 @@ Provides:	php(libxml)
 Provides:	php(reflection)
 Provides:	php(standard)
 %{!?with_mysqlnd:Obsoletes:	%{name}-mysqlnd}
-%{?with_pcre:%requires_ge_to	pcre pcre-devel}
+%{?with_pcre:%requires_ge_to	pcre2-8 pcre2-8-devel}
 Suggests:	browscap
 Obsoletes:	php-common < 4:5.3.28-7
 # withdrawn modules
@@ -621,7 +621,7 @@ Requires:	libtool >= 2:2.4.6
 %else
 Requires:	libtool
 %endif
-%{?with_pcre:Requires:	pcre-devel >= 8.10}
+%{?with_pcre:Requires:	pcre2-8-devel >= 10.30}
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	php-devel
@@ -2048,7 +2048,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 #%{__rm} -r ext/gd/libgd
 #%{__rm} -r ext/mbstring/libmbfl
 %{__rm} -r ext/mbstring/oniguruma
-%{__rm} -r ext/pcre/pcrelib
+%{__rm} -r ext/pcre/pcre2lib
 #%{__rm} -r ext/soap/interop
 %{__rm} -r ext/xmlrpc/libxmlrpc
 #%{__rm} -r ext/zip/lib
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/d48807f9401cb3058410533c66cc58983067c944



More information about the pld-cvs-commit mailing list