diff --git a/.gitignore b/.gitignore index bf629f7..7a17fb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/xdebug-3.1.2-52911af.tar.gz /xdebug-3.1.2-52911af.tar.gz +/xdebug-3.2.2-a909eb0.tar.gz diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec index afc643e..00ae9ff 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-2021 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 52911afee0d66f4569d71d25bb9532c8fab9d5f5 +%global gh_commit a909eb088ad9fd8c8e09fcc71d892fa54b957b31 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) # version/release -%global upstream_version 3.1.2 +%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 @@ -92,11 +86,6 @@ mv NTS/package.xml . sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd NTS -# ignore tests relying on DNS -find tests -type f -exec grep -q 'xdebug.client_host=' {} \; -delete -print -# ignore test with erratic result -rm tests/debugger/start_with_request_default_no_env.phpt - # Check extension version ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h) if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then @@ -190,10 +179,14 @@ done cd NTS : Upstream test suite NTS extension -%ifarch %{ix86} +# ignore tests relying on DNS +find tests -type f -exec grep -q 'xdebug.client_host=' {} \; -delete -print +# ignore test with erratic result +rm tests/debugger/start_with_request_default_no_env.phpt # see https://bugs.xdebug.org/view.php?id=2048 rm tests/base/bug02036.phpt -%endif +# Erratic result +rm tests/debugger/bug00998-ipv6.phpt # bug00886 is marked as slow as it uses a lot of disk space TEST_OPTS="-q -x --show-diff" @@ -222,6 +215,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Nov 27 2023 Remi Collet - 3.2.2-1 +- update to 3.2.2 for PHP 8.2 RHEL-14705 + * Fri Dec 10 2021 Remi Collet - 3.1.2-1 - update to 3.1.2 rhbz#2030322 diff --git a/sources b/sources index 133c64b..396460d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdebug-3.1.2-52911af.tar.gz) = 068f987997adb0506eb27bdfc9b030faf6404475acbe96fd44a2ae757fc97a615d9c2a9a24df9fa8d6af09b1af58fc2f4984894976a49757cce504225c13a66a +SHA512 (xdebug-3.2.2-a909eb0.tar.gz) = 4189405250d343a644f2dc874979724f632bf016f729219d3b6460938953ffa3a87d00ec3ecb1800ca861c47084304591b0f93ad94c943b0f893d9272dfdf4f5