From d5116f6c44503a30f141db555c26d883a7a7339e Mon Sep 17 00:00:00 2001
From: Remi Collet <rcollet@redhat.com>
Date: Fri, 24 Nov 2023 08:25:11 +0100
Subject: [PATCH] update to 3.2.2 for PHP 8.2

Related: RHEL-14699
---
 .gitignore            |  1 +
 php-pecl-xdebug3.spec | 29 +++++++++++++----------------
 sources               |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed22566..ade111f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xdebug-3.1.4-d7f4cdf.tar.gz
+/xdebug-3.2.2-a909eb0.tar.gz
diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec
index 0d21fc2..fc80229 100644
--- a/php-pecl-xdebug3.spec
+++ b/php-pecl-xdebug3.spec
@@ -1,6 +1,6 @@
 # Fedora spec file for php-pecl-xdebug3
 #
-# Copyright (c) 2010-2022 Remi Collet
+# Copyright (c) 2010-2023 Remi Collet
 # Copyright (c) 2006-2009 Christopher Stone
 #
 # License: MIT
@@ -9,18 +9,18 @@
 # Please, preserve the changelog entries
 #
 
-%bcond_without      tests
+%bcond_without     tests
 
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
 %global pecl_name  xdebug
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit  d7f4cdfa8d88fc663550f579ca2b82080832cec3
+%global gh_commit  a909eb088ad9fd8c8e09fcc71d892fa54b957b31
 %global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
 
 # version/release
-%global upstream_version 3.1.4
+%global upstream_version 3.2.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -33,14 +33,12 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        1%{?dist}
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
-# The Xdebug License, version 1.01
-# (Based on "The PHP License", version 3.0)
-License:        BSD
+License:        Xdebug-1.03
 URL:            https://xdebug.org/
 
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  php-devel >= 7.2
+BuildRequires:  php-devel >= 8.0
 BuildRequires:  php-pear
 BuildRequires:  php-simplexml
 BuildRequires:  libtool
@@ -54,14 +52,10 @@ Provides:       php-%{pecl_name}%{?_isa}      = %{version}
 Provides:       php-pecl(Xdebug)              = %{version}
 Provides:       php-pecl(Xdebug)%{?_isa}      = %{version}
 
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 || "%{php_version}" > "8.0"
-Obsoletes:     php-pecl-%{pecl_name}          < 3
-Provides:      php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:      php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%else
-# A single version can be installed
-Conflicts:     php-pecl-%{pecl_name}          < 3
-%endif
+# package was renamed on new major version
+Obsoletes:      php-pecl-%{pecl_name}         < 3
+Provides:       php-pecl-%{pecl_name}         = %{version}-%{release}
+Provides:       php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
 
 %description
 The Xdebug extension helps you debugging your script by providing a lot of
@@ -221,6 +215,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Fri Nov 24 2023 Remi Collet <rcollet@redhat.com> - 3.2.2-1
+- update to 3.2.2 for PHP 8.2 RHEL-14699
+
 * Mon May 16 2022 Remi Collet <rcollet@redhat.com> - 3.1.4-1
 - update to 3.1.4 for PHP 8.1 #2070040
 
diff --git a/sources b/sources
index ecbd74e..396460d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdebug-3.1.4-d7f4cdf.tar.gz) = cd793a3538ae17d0cb4bee926dea339edf36fa342718c4eee397fb6544e18e162f1bbd49b3cfb7033c13a82ec1c94d4030f2d70cd77877a0a61658c0fb099081
+SHA512 (xdebug-3.2.2-a909eb0.tar.gz) = 4189405250d343a644f2dc874979724f632bf016f729219d3b6460938953ffa3a87d00ec3ecb1800ca861c47084304591b0f93ad94c943b0f893d9272dfdf4f5