Compare commits

...

No commits in common. "c8s-stream-8.0" and "c9-stream-8.1" have entirely different histories.

3 changed files with 14 additions and 12 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/xdebug-3.1.2-52911af.tar.gz
SOURCES/xdebug-3.1.4-d7f4cdf.tar.gz

View File

@ -1 +1 @@
0d487e5ba43ac5bcb4f659a54c700e5887012ecc SOURCES/xdebug-3.1.2-52911af.tar.gz
010a184f902447826e938455d1c16963c7a26205 SOURCES/xdebug-3.1.4-d7f4cdf.tar.gz

View File

@ -1,6 +1,6 @@
# Fedora spec file for php-pecl-xdebug3
#
# Copyright (c) 2010-2021 Remi Collet
# Copyright (c) 2010-2022 Remi Collet
# Copyright (c) 2006-2009 Christopher Stone
#
# License: MIT
@ -16,11 +16,11 @@
%global pecl_name xdebug
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global gh_commit 52911afee0d66f4569d71d25bb9532c8fab9d5f5
%global gh_commit d7f4cdfa8d88fc663550f579ca2b82080832cec3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
# version/release
%global upstream_version 3.1.2
%global upstream_version 3.1.4
#global upstream_prever RC1
#global upstream_lower rc1
@ -92,11 +92,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 +185,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 +221,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
* Mon May 16 2022 Remi Collet <rcollet@redhat.com> - 3.1.4-1
- update to 3.1.4 for PHP 8.1 #2070040
* Fri Dec 10 2021 Remi Collet <rcollet@redhat.com> - 3.1.2-1
- update to 3.1.2 rhbz#2030322