From aba46d2e244a47d4f41af73c6158c2b8e31ff148 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Dec 2020 13:59:44 +0100 Subject: don't register autoloader twice, e.g. by doctrine/dbal v3 --- php-doctrine-dbal.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index 5d93176..3312da1 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -38,7 +38,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Doctrine Database Abstraction Layer (DBAL) License: MIT @@ -158,7 +158,9 @@ cat <<'AUTOLOAD' | tee lib/Doctrine/DBAL/autoload.php */ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__); +if (!class_exists('Doctrine\\DBAL\\Connection')) { + \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__); +} \Fedora\Autoloader\Dependencies::required(array( '%{phpdir}/Doctrine/Common/Cache/autoload.php', @@ -220,6 +222,9 @@ exit $RETURN_CODE %changelog +* Tue Dec 8 2020 Remi Collet - 2.12.1-2 +- don't register autoloader twice, e.g. by doctrine/dbal v3 + * Mon Nov 16 2020 Remi Collet - 2.12.1-1 - update to 2.12.1 -- cgit