summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-02-01 08:39:11 +0100
committerRemi Collet <remi@php.net>2023-02-01 08:39:11 +0100
commit5fafa29b593f4dcc46a1a41c1755eaf64efb7db7 (patch)
tree5d2e85b3a78007d6c34bfba1470da8f280d5ffd7
parentffc0db5222cede2d892c106634b4fe7f21ea94e9 (diff)
Update to 8.2.2 - http://www.php.net/releases/8_2_2.phpv8.2.2
add dependency on pcre2 minimal version
-rw-r--r--failed.txt2
-rw-r--r--php82.spec14
2 files changed, 13 insertions, 3 deletions
diff --git a/failed.txt b/failed.txt
index ae614ec..a214bb0 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.2.2RC1 (2023-01-19)
+===== 8.2.2 (2023-02-02)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php82.spec b/php82.spec
index 4bdd8ec..f57c5f9 100644
--- a/php82.spec
+++ b/php82.spec
@@ -108,7 +108,7 @@
%bcond_with zip
%global upver 8.2.2
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -206,7 +206,7 @@ BuildRequires: pkgconfig(libedit)
%if %{with libpcre}
BuildRequires: pkgconfig(libpcre2-8) >= 10.30
%else
-Provides: bundled(pcre2) = 10.32
+Provides: bundled(pcre2) = 10.40
%endif
%if %{with libxcrypt}
BuildRequires: pkgconfig(libxcrypt)
@@ -381,6 +381,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}
@@ -2176,6 +2182,10 @@ fi
%changelog
+* Wed Feb 1 2023 Remi Collet <remi@remirepo.net> - 8.2.2-1
+- Update to 8.2.2 - http://www.php.net/releases/8_2_2.php
+- add dependency on pcre2 minimal version
+
* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 8.2.2~RC1-1
- update to 8.2.2RC1