summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-02-01 08:38:51 +0100
committerRemi Collet <remi@php.net>2023-02-01 08:38:51 +0100
commitf2475555964f2d3114842c47b7e10f9ca067fb57 (patch)
tree69db60cfc65186c1eef6b35f138b42508a94d2b7
parent54d8390fd508ebe5ea9526753b1787f4d994662a (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--php.spec14
2 files changed, 13 insertions, 3 deletions
diff --git a/failed.txt b/failed.txt
index 745b07a..74a99a6 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/php.spec b/php.spec
index e6ef5be..c481367 100644
--- a/php.spec
+++ b/php.spec
@@ -123,7 +123,7 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.2.2
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -220,7 +220,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)
@@ -371,6 +371,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: %{?scl_prefix}php(api) = %{apiver}-%{__isa_bits}
Provides: %{?scl_prefix}php(zend-abi) = %{zendver}-%{__isa_bits}
@@ -1847,6 +1853,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