From fed5d8dda37d24c1171e925b8265a2611cd660b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Oct 2018 08:50:13 +0200 Subject: update to 2.8.0 drop dependency on doctrine/common add dependency on doctrine/cache add dependency on doctrine/event-manager allow Symfony 4 --- php-doctrine-dbal.spec | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) (limited to 'php-doctrine-dbal.spec') diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec index ed05f2a..23940a7 100644 --- a/php-doctrine-dbal.spec +++ b/php-doctrine-dbal.spec @@ -13,20 +13,23 @@ %global github_owner doctrine %global github_name dbal -%global github_version 2.7.2 -%global github_commit c0e5736016a51b427a8cba8bc470fbea78165819 +%global github_version 2.8.0 +%global github_commit 5140a64c08b4b607b9bedaae0cedd26f04a0e621 %global composer_vendor doctrine %global composer_project dbal # "php": "^7.1" %global php_min_ver 7.1 -# "doctrine/common": "^2.7.1" -%global doctrine_common_min_ver 2.7.1 -%global doctrine_common_max_ver 3.0 -# "symfony/console": "^2.0.5||^3.0" +# "doctrine/cache": "^1.0" +%global doctrine_cache_min_ver 1.0 +%global doctrine_cache_max_ver 2 +# "doctrine/event-manager": "^1.0" +%global doctrine_event_min_ver 1.0 +%global doctrine_event_max_ver 2 +# "symfony/console": "^2.0.5|^3.0|^4.0" %global symfony_console_min_ver 2.0.5 -%global symfony_console_max_ver 4.0 +%global symfony_console_max_ver 5 # "symfony/phpunit-bridge": "^3.4.5|^4.0.5" %global symfony_phpunit_min_ver 4.0.5 %global symfony_phpunit_max_ver 5.0 @@ -57,17 +60,20 @@ Patch0: %{name}-bin.patch BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: phpunit7 +BuildRequires: phpunit7 >= 7.1.2 ## composer.json BuildRequires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires:(php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver}) +BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) +BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_max_ver}) ## composer.json (optional) BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) BuildRequires:(php-composer(symfony/phpunit-bridge) >= %{symfony_phpunit_min_ver} with php-composer(symfony/phpunit-bridge) < %{symfony_phpunit_max_ver}) %else -BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} -BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} +BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} +BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} +BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver} BuildRequires: php-symfony4-phpunit-bridge ## composer.json (optional) BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver} @@ -87,12 +93,15 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver}) +Requires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) +Requires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_max_ver}) # composer.json (optional) Requires: (php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver}) %else -Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} -Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver} +Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} +Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} +Requires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver} # composer.json (optional) Requires: php-composer(symfony/console) >= %{symfony_console_min_ver} Requires: php-composer(symfony/console) < %{symfony_console_max_ver} @@ -152,12 +161,14 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__); \Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/Doctrine/Common/autoload.php', + '%{phpdir}/Doctrine/Common/Cache/autoload.php', + '%{phpdir}/Doctrine/Common/EventManager/autoload.php', )); \Fedora\Autoloader\Dependencies::optional([ [ - (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony3') . '/Component/Console/autoload.php', + (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony4') . '/Component/Console/autoload.php', + '%{phpdir}/Symfony3/Component/Console/autoload.php', '%{phpdir}/Symfony/Component/Console/autoload.php', ], ]); @@ -210,6 +221,13 @@ exit $RETURN_CODE %changelog +* Thu Oct 18 2018 Remi Collet - 2.8.0-1 +- update to 2.8.0 +- drop dependency on doctrine/common +- add dependency on doctrine/cache +- add dependency on doctrine/event-manager +- allow Symfony 4 + * Wed Oct 17 2018 Remi Collet - 2.7.2-1 - update to 2.7.2 - raise dependencies on PHP 7.1 -- cgit