summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-08-04 14:07:36 +0200
committerRemi Collet <remi@remirepo.net>2021-08-04 14:07:36 +0200
commitd6f05e21dab46ec89b07eb7768b804739ab4baff (patch)
tree750c32d836cca0c59a256384aaac3c9b7d09c9eb
parent1e5a0dec8f1c3ef419811b40f0cc625ab842aa9d (diff)
add patch for test suite with 8.1.0beta2 from
https://github.com/laruence/yac/pull/120
-rw-r--r--php-pecl-yac.spec10
-rw-r--r--yac-php81.patch19
2 files changed, 28 insertions, 1 deletions
diff --git a/php-pecl-yac.spec b/php-pecl-yac.spec
index 7580894..8d9f4c1 100644
--- a/php-pecl-yac.spec
+++ b/php-pecl-yac.spec
@@ -35,10 +35,12 @@ URL: https://pecl.php.net/package/%{pecl_name}
Release: 0.13.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
%else
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
+Patch0: %{pecl_name}-php81.patch
+
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -110,6 +112,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1
+
%if %{with_fastlz}
sed -e '\:name="compressor/fastlz:d' -i ../package.xml
rm -r compressor/fastlz
@@ -272,6 +276,10 @@ fi
%changelog
+* Wed Aug 4 2021 Remi Collet <remi@remirepo.net> - 2.3.0-4
+- add patch for test suite with 8.1.0beta2 from
+ https://github.com/laruence/yac/pull/120
+
* Fri Apr 30 2021 Remi Collet <remi@remirepo.net> - 2.3.0-3
- F34 rebuild for https://github.com/remicollet/remirepo/issues/174
diff --git a/yac-php81.patch b/yac-php81.patch
new file mode 100644
index 0000000..e4d4c45
--- /dev/null
+++ b/yac-php81.patch
@@ -0,0 +1,19 @@
+From 14fd1ecb6d95b9eecf3356fb2b3f01d937d2e4b5 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 4 Aug 2021 14:05:13 +0200
+Subject: [PATCH] relax test for 8.1.0beta2
+
+---
+ tests/023.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/023.phpt b/tests/023.phpt
+index 0dce792..1fc658a 100644
+--- a/tests/023.phpt
++++ b/tests/023.phpt
+@@ -9,4 +9,4 @@ yac.enable=0
+ class Sub extends Yac {};
+ ?>
+ --EXPECTF--
+-Fatal error: Class Sub may not inherit from final class (Yac) in %s023.php on line %d
++Fatal error: Class Sub %s final class %s