From ed0368d4b4c9356088b0975797d5aed8a6c2a466 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jul 2021 14:19:26 +0200 Subject: add mandatory dependency on symfony/cache --- php-doctrine-cache2.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/php-doctrine-cache2.spec b/php-doctrine-cache2.spec index 141a50f..3daa0ad 100644 --- a/php-doctrine-cache2.spec +++ b/php-doctrine-cache2.spec @@ -40,7 +40,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Doctrine Cache version %{major} License: MIT @@ -83,7 +83,10 @@ Requires: php-composer(fedora/autoloader) # remirepo:1 %if 0%{?fedora} > 21 || 0%{?rhel} >= 8 Suggests: php-composer(alcaeus/mongo-php-adapter) -# remirepo:1 +Requires: (php-composer(symfony/cache) >= %{symfony_min_ver} with php-composer(symfony/cache) < %{symfony_max_ver}) +# remirepo:3 +%else +Requires: php-symfony4-cache >= %{symfony_min_ver} %endif # Composer @@ -115,6 +118,12 @@ cat <<'AUTOLOAD' | tee lib/Doctrine/Common/Cache/autoload.php require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Common\\Cache\\', __DIR__); +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/Symfony5/Component/Cache/autoload.php', + '%{phpdir}/Symfony4/Component/Cache/autoload.php', + ], +]); \Fedora\Autoloader\Dependencies::optional([ '/usr/share/php/Alcaeus/MongoDbAdapter/autoload.php', '/usr/share/php/MongoDB/autoload.php', @@ -147,9 +156,6 @@ require_once '%{buildroot}%{phpdir}/Doctrine/Common/Cache%{major}/autoload.php'; [ '%{phpdir}/Psr/Cache2/autoload.php', '%{phpdir}/Psr/Cache/autoload.php', - ], [ - '%{phpdir}/Symfony5/Component/Cache/autoload.php', - '%{phpdir}/Symfony4/Component/Cache/autoload.php', ], ]); BOOTSTRAP @@ -182,6 +188,9 @@ exit $RETURN_CODE %changelog +* Mon Jul 5 2021 Remi Collet - 2.0.3-2 +- add mandatory dependency on symfony/cache + * Tue May 25 2021 Remi Collet - 2.0.3-1 - update to 2.0.3 -- cgit