From a6b86ca5085d02775d74a90f01c26767ad518f8a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Jan 2022 09:27:26 +0100 Subject: fix autoloader --- php-doctrine-persistence2.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec index 574bb76..03b98ab 100644 --- a/php-doctrine-persistence2.spec +++ b/php-doctrine-persistence2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-doctrine-persistence2 # -# Copyright (c) 2018-2021 Remi Collet +# Copyright (c) 2018-2022 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: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Doctrine Persistence abstractions License: MIT @@ -60,7 +60,7 @@ BuildRequires: (php-composer(doctrine/collections) >= 1.0 with php-composer( BuildRequires: (php-composer(doctrine/event-manager) >= 1.0 with php-composer(doctrine/event-manager) < 2) BuildRequires: (php-composer(doctrine/common) >= 3.0 with php-composer(doctrine/common) < 4) BuildRequires: (php-composer(doctrine/deprecations) >= 0.5.3 with php-composer(doctrine/deprecations) < 1) -BuildRequires: (php-composer(symfony/cache) >= 4.4 with php-composer(symfony/cache) < 6) +BuildRequires: (php-composer(symfony/cache) >= 4.4 with php-composer(symfony/cache) < 7) BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) # remirepo:10 %else @@ -142,7 +142,6 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/Psr/Cache/autoload.php', '%{_datadir}/php/%{ns_vendor}/Deprecations/autoload.php', - '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php', [ '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache2/autoload.php', '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache/autoload.php', @@ -171,7 +170,12 @@ cat << 'EOF' | tee -a vendor/autoload.php require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php"; \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/%{ns_vendor}/Common3/autoload.php', - '%{_datadir}/php/Symfony4/Component/Cache/autoload.php', + '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php', + [ + '%{_datadir}/php/Symfony6/Component/Cache/autoload.php', + '%{_datadir}/php/Symfony5/Component/Cache/autoload.php', + '%{_datadir}/php/Symfony4/Component/Cache/autoload.php', + ], ]); EOF @@ -205,6 +209,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Remi Collet - 2.3.0-2 +- fix autoloader + * Mon Jan 10 2022 Remi Collet - 2.3.0-1 - update to 2.3.0 -- cgit