From 862994ec4c8607169d76135b90adca18df6559f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Oct 2021 10:26:02 +0200 Subject: allow doctrine/dbal v3 --- php-doctrine-orm.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 7001f5a..808f1e9 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -33,9 +33,9 @@ # "doctrine/common": "^3.0.3" %global common_min_ver 3.0.3 %global common_max_ver 4 -# "doctrine/dbal": "^2.13" +# "doctrine/dbal": "^2.13 || ^3.1.1" %global dbal_min_ver 2.13 -%global dbal_max_ver 3 +%global dbal_max_ver 4 # "doctrine/deprecations": "^0.5.3" %global deprecations_min_ver 0.5.3 %global deprecations_max_ver 1 @@ -76,7 +76,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Doctrine Object-Relational-Mapper (ORM) License: MIT @@ -305,7 +305,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Doctrine/Common/EventManager/autoload.php', '%{phpdir}/Doctrine/Common/Lexer/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', - '%{phpdir}/Doctrine/DBAL/autoload.php', + [ + '%{phpdir}/Doctrine/DBAL3/autoload.php', + '%{phpdir}/Doctrine/DBAL2/autoload.php', + ], '%{phpdir}/Doctrine/Instantiator/autoload.php', [ '%{phpdir}/Symfony6/Component/Console/autoload.php', @@ -397,10 +400,11 @@ exit $RETURN_CODE %changelog -* Mon Oct 4 2021 Remi Collet - 2.10.0-1 +* Mon Oct 4 2021 Remi Collet - 2.10.0-2 - update to 2.10.0 - drop dependency on doctrine/annotations - add dependency on symfony/polyfill-php80 +- allow doctrine/dbal v3 * Mon Oct 4 2021 Remi Collet - 2.9.6-1 - update to 2.9.6 -- cgit