From 7ea0539bf780a37d5417d3f2229854258d14ba56 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 1 Sep 2022 10:17:49 +0200
Subject: update to 8.2.0RC1

bump to final API/ABI
---
 php.spec | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 639b458..2cfcd0d 100644
--- a/php.spec
+++ b/php.spec
@@ -23,8 +23,8 @@
 %endif
 
 # API/ABI check
-%global apiver      20210903
-%global zendver     20210903
+%global apiver      20220829
+%global zendver     20220829
 %global pdover      20170320
 # Extension version
 %global oci8ver     3.2.1
@@ -123,13 +123,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.2.0
-%global rcver        beta3
+%global rcver        RC1
 %global lower        %(echo %{rcver} | tr '[:upper:]' '[:lower:]')
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 11%{?dist}
+Release: 12%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -171,7 +171,7 @@ Patch5: php-7.2.0-includedir.patch
 Patch6: php-8.0.0-embed.patch
 Patch8: php-8.1.0-libdb.patch
 # RHEL backports
-Patch10: php-7.0.7-curl.patch
+Patch10: php-8.2.0-curl.patch
 
 # Functional changes
 # Use system nikic/php-parser
@@ -949,7 +949,7 @@ in pure PHP.
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch8 -p1 -b .libdb
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
 %patch10 -p1 -b .curltls
 %endif
 
@@ -999,6 +999,10 @@ mkdir \
 rm ext/date/tests/timezone_location_get.phpt
 rm ext/date/tests/bug80963.phpt
 %endif
+%if 0%{?fedora} < 36
+# need tzdata 2022b
+rm ext/date/tests/bug33415-2.phpt
+%endif
 # too fast builder
 rm ext/date/tests/bug73837.phpt
 # fails sometime
@@ -1844,6 +1848,10 @@ fi
 
 
 %changelog
+* Thu Sep  1 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc1-12
+- update to 8.2.0RC1
+- bump to final API/ABI
+
 * Wed Aug 17 2022 Remi Collet <remi@remirepo.net> - 8.2.0~beta3-11
 - update to 8.2.0beta3
 - use oracle client library version 21.7
-- 
cgit