summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-02-01 10:49:56 +0100
committerRemi Collet <remi@php.net>2023-02-01 10:49:56 +0100
commit4852755785852b5179eaa1457d92195ee820440c (patch)
treec412cb2a98311a95627c63685e7caa350fe0dc17
parent7ef988e3f02ed363e158db04bde4c57401a6bf17 (diff)
add dependency on pcre2 minimal version
-rw-r--r--failed.txt2
-rw-r--r--php80.spec8
2 files changed, 8 insertions, 2 deletions
diff --git a/failed.txt b/failed.txt
index c118cea..48dddf1 100644
--- a/failed.txt
+++ b/failed.txt
@@ -3,7 +3,7 @@
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/el7x80/build.log:Tests failed : 0
-/var/lib/mock/el8x80/build.log:Tests failed : 1
+/var/lib/mock/el8x80/build.log:Tests failed : 0
/var/lib/mock/el9x80/build.log:Tests failed : 0
/var/lib/mock/fc35x/build.log:Tests failed : 0
/var/lib/mock/fc36x80/build.log:Tests failed : 0
diff --git a/php80.spec b/php80.spec
index 604cbc3..36547ff 100644
--- a/php80.spec
+++ b/php80.spec
@@ -208,7 +208,7 @@ BuildRequires: pkgconfig(libedit)
%if %{with libpcre}
BuildRequires: pkgconfig(libpcre2-8) >= 10.30
%else
-Provides: bundled(pcre2) = 10.32
+Provides: bundled(pcre2) = 10.35
%endif
%if %{with libxcrypt}
BuildRequires: pkgconfig(libxcrypt)
@@ -379,6 +379,12 @@ Summary: Common files for PHP
# fileinfo is licensed under PHP version 3.0
# regex, libmagic are licensed under BSD
License: PHP and BSD
+
+%if %{with libpcre}
+%global pcre2_buildver %(pkg-config --silence-errors --modversion libpcre2-8 2>/dev/null || echo 10.30)
+Requires: pcre2%{?_isa} >= %{pcre2_buildver}
+%endif
+
# ABI/API check - Arch specific
Provides: php(api) = %{apiver}-%{__isa_bits}
Provides: php(zend-abi) = %{zendver}-%{__isa_bits}