From d308e8ed27573b61273c61d7905ebacddbc58ae5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Aug 2022 16:28:15 +0200 Subject: fix test suite with recent symfony, FTBFS #2113592 --- php-sebastian-diff3.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 87cc564..301c112 100644 --- a/php-sebastian-diff3.spec +++ b/php-sebastian-diff3.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sebastian-diff3 # -# Copyright (c) 2013-2021 Remi Collet +# Copyright (c) 2013-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,13 +28,16 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 3.0.3 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Diff implementation License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +# Fix for recent Symfony +Patch0: %{name}-tests.patch + BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with_tests} @@ -68,6 +71,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p0 %build @@ -98,7 +102,7 @@ rm -r tests/Output/Integration : Run upstream test suite ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 --verbose || ret=1 @@ -121,6 +125,9 @@ exit $ret %changelog +* Wed Aug 3 2022 Remi Collet - 3.0.3-6 +- fix test suite with recent symfony, FTBFS #2113592 + * Mon Aug 2 2021 Remi Collet - 3.0.3-4 - fix symfony autoloader usage -- cgit