From 35bea93b099bb89356afc622b85d24e2eac969e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Aug 2021 09:16:45 +0200 Subject: [PATCH] fix symfony autoloader usage (cherry picked from commit ed2a52004d0a3165d48d5f8440f498d7dbb5ec3c) --- php-sebastian-diff3.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 3e6a84f..faad568 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-2019 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -28,7 +28,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 3.0.3 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Diff implementation License: BSD @@ -85,13 +85,15 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} mkdir vendor %{_bindir}/phpab --output vendor/autoload.php tests cat << 'EOF' | tee -a vendor/autoload.php -\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process'); +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/Symfony4/Component/Process/autoload.php', +]); EOF : Run upstream test suite ret=0 -for cmd in php php72 php73 php80; do +for cmd in php php73 php74 php80; 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 @@ -112,6 +114,9 @@ exit $ret %changelog +* Mon Aug 2 2021 Remi Collet - 3.0.3-4 +- fix symfony autoloader usage + * Wed Jan 27 2021 Fedora Release Engineering - 3.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild