From 1b57188dc03261459515d606d86e55cc5be4f37b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Nov 2022 14:58:01 +0100
Subject: update to 3.1.6

---
 PHPINFO               |  2 +-
 REFLECTION            |  2 +-
 php-pecl-xdebug3.spec | 19 ++++++-------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index c792192..9f4ec8c 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -10,7 +10,7 @@ xdebug
                               __/ |
                              |___/ 
 
-Version => 3.1.5
+Version => 3.1.6
 Support Xdebug on Patreon, GitHub, or as a business: https://xdebug.org/support
 
              Enabled Features (through 'xdebug.mode' setting)             
diff --git a/REFLECTION b/REFLECTION
index a12ff25..1c1376b 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #16 xdebug version 3.1.5 ] {
+Extension [ <persistent> extension #16 xdebug version 3.1.6 ] {
 
   - INI {
     Entry [ xdebug.mode <SYSTEM> ]
diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec
index 069109a..cf0cd78 100644
--- a/php-pecl-xdebug3.spec
+++ b/php-pecl-xdebug3.spec
@@ -21,12 +21,12 @@
 
 %global pecl_name   xdebug
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit   9f4bbc4a299e2c34033b01e9cc8e6b78d927a5bd
+%global gh_commit   2fe95fed7ee9f1f679680db641f4f48c3f381057
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date     20201011
 
 # version/release
-%global upstream_version 3.1.5
+%global upstream_version 3.1.6
 #global upstream_prever  beta2
 #global upstream_lower   beta2
 
@@ -51,6 +51,7 @@ Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.2
+BuildRequires:  %{?scl_prefix}php-devel <  8.2
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-simplexml
 BuildRequires:  libtool
@@ -74,17 +75,6 @@ Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{relea
 Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}          < 3
 %endif
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-# older versions are obsoleted by php-pecl-xdebug v2
-%if "%{php_version}" > "8.0"
-Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:     php81-pecl-%{pecl_name}  <= %{version}
-%endif
-%endif
-
 
 %description
 The Xdebug extension helps you debugging your script by providing a lot of
@@ -273,6 +263,9 @@ fi
 
 
 %changelog
+* Tue Nov  8 2022 Remi Collet <remi@remirepo.net> - 3.1.6-1
+- update to 3.1.6
+
 * Tue Jun  7 2022 Remi Collet <remi@remirepo.net> - 3.1.5-1
 - update to 3.1.5
 
-- 
cgit