From 0d3b5afc728d3776b76b6f2ad00c0c6bc77a722c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 May 2020 11:34:07 +0200 Subject: update to 2.7.3 allow doctrine/common v3 allow doctrine/persistence v2 add dependency on doctrine/inflector add dependency on doctrine/lexer --- php-doctrine-orm.spec | 55 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 11 deletions(-) (limited to 'php-doctrine-orm.spec') diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index cb9ba6f..8088315 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name orm -%global github_version 2.7.2 -%global github_commit dafe298ce5d0b995ebe1746670704c0a35868a6a +%global github_version 2.7.3 +%global github_commit d95e03ba660d50d785a9925f41927fef0ee553cf %global composer_vendor doctrine %global composer_project orm @@ -30,18 +30,24 @@ # "doctrine/collections": "^1.5" %global collections_min_ver 1.5 %global collections_max_ver 2 -# "doctrine/common": "^2.11" +# "doctrine/common": "^2.11 || ^3.0" %global common_min_ver 2.11 -%global common_max_ver 3 +%global common_max_ver 4 # "doctrine/dbal": "^2.9.3" %global dbal_min_ver 2.9.3 %global dbal_max_ver 3 +# "doctrine/inflector": "^1.0" +%global inflector_min_ver 1.0 +%global inflector_max_ver 2 # "doctrine/instantiator": "^1.3" %global instantiator_min_ver 1.3 %global instantiator_max_ver 2 -# "doctrine/persistence": "^1.2" -%global persistence_min_ver 1.2 -%global persistence_max_ver 2 +# "doctrine/lexer": "^1.0" +%global lexer_min_ver 1.0 +%global lexer_max_ver 2 +# "doctrine/persistence": "^1.3.3 || ^2.0" +%global persistence_min_ver 1.3.3 +%global persistence_max_ver 3 # "doctrine/event-manager": "^1.1" %global event_min_ver 1.1 %global event_max_ver 2 @@ -86,8 +92,10 @@ BuildRequires: (php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: (php-composer(doctrine/collections) >= %{collections_min_ver} with php-composer(doctrine/collections) < %{collections_max_ver}) BuildRequires: (php-composer(doctrine/common) >= %{common_min_ver} with php-composer(doctrine/common) < %{common_max_ver}) BuildRequires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) +BuildRequires: (php-composer(doctrine/inflector) >= %{inflector_min_ver} with php-composer(doctrine/inflector) < %{inflector_max_ver}) BuildRequires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) BuildRequires: (php-composer(doctrine/event-manager) >= %{event_min_ver} with php-composer(doctrine/event-manager) < %{event_max_ver}) +BuildRequires: (php-composer(doctrine/lexer) >= %{lexer_min_ver} with php-composer(doctrine/lexer) < %{lexer_max_ver}) BuildRequires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) @@ -103,10 +111,14 @@ BuildRequires: php-composer(doctrine/common) < %{common_max_ver} BuildRequires: php-composer(doctrine/common) >= %{common_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +BuildRequires: php-composer(doctrine/inflector) < %{inflector_max_ver} +BuildRequires: php-composer(doctrine/inflector) >= %{inflector_min_ver} BuildRequires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} BuildRequires: php-composer(doctrine/instantiator) >= %{instantiator_min_ver} BuildRequires: php-composer(doctrine/event-manager) < %{event_max_ver} BuildRequires: php-composer(doctrine/event-manager) >= %{event_min_ver} +BuildRequires: php-composer(doctrine/lexer) < %{lexer_max_ver} +BuildRequires: php-composer(doctrine/lexer) >= %{lexer_min_ver} BuildRequires: php-composer(doctrine/persistence) < %{persistence_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{persistence_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} @@ -139,13 +151,15 @@ Requires: (php-composer(doctrine/cache) >= %{cache_min_ver} Requires: (php-composer(doctrine/collections) >= %{collections_min_ver} with php-composer(doctrine/collections) < %{collections_max_ver}) Requires: (php-composer(doctrine/common) >= %{common_min_ver} with php-composer(doctrine/common) < %{common_max_ver}) Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) +Requires: (php-composer(doctrine/inflector) >= %{inflector_min_ver} with php-composer(doctrine/inflector) < %{inflector_max_ver}) Requires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) Requires: (php-composer(doctrine/event-manager) >= %{event_min_ver} with php-composer(doctrine/event-manager) < %{event_max_ver}) +Requires: (php-composer(doctrine/lexer) >= %{lexer_min_ver} with php-composer(doctrine/lexer) < %{lexer_max_ver}) Requires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) # composer.json: suggest Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) -# remirepo:22 +# remirepo:26 %else Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -157,10 +171,14 @@ Requires: php-composer(doctrine/common) < %{common_max_ver} Requires: php-composer(doctrine/common) >= %{common_min_ver} Requires: php-composer(doctrine/dbal) < %{dbal_max_ver} Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +Requires: php-composer(doctrine/inflector) < %{inflector_max_ver} +Requires: php-composer(doctrine/inflector) >= %{inflector_min_ver} Requires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} Requires: php-composer(doctrine/instantiator) >= %{instantiator_min_ver} Requires: php-composer(doctrine/event-manager) < %{event_max_ver} Requires: php-composer(doctrine/event-manager) >= %{event_min_ver} +Requires: php-composer(doctrine/lexer) < %{lexer_max_ver} +Requires: php-composer(doctrine/lexer) >= %{lexer_min_ver} Requires: php-composer(doctrine/persistence) < %{persistence_max_ver} Requires: php-composer(doctrine/persistence) >= %{persistence_min_ver} Requires: php-composer(symfony/console) < %{symfony_max_ver} @@ -241,11 +259,19 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/Doctrine/Common/autoload.php', + [ + '%{phpdir}/Doctrine/Common3/autoload.php', + '%{phpdir}/Doctrine/Common/autoload.php', + ], '%{phpdir}/Doctrine/Common/Cache/autoload.php', '%{phpdir}/Doctrine/Common/Collections/autoload.php', + '%{phpdir}/Doctrine/Common/Inflector/autoload.php', '%{phpdir}/Doctrine/Common/EventManager/autoload.php', - '%{phpdir}/Doctrine/Common/Persistence/autoload.php', + '%{phpdir}/Doctrine/Common/Lexer/autoload.php', + [ + '%{phpdir}/Doctrine/Persistence2/autoload.php', + '%{phpdir}/Doctrine/Persistence/autoload.php', + ], '%{phpdir}/Doctrine/DBAL/autoload.php', '%{phpdir}/Doctrine/Instantiator/autoload.php', [ @@ -296,7 +322,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in "" php71 php72 php73 php74; do +for PHP_EXEC in "" php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit7 --verbose -d memory_limit="512M" --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -319,6 +345,13 @@ exit $RETURN_CODE %changelog +* Wed May 27 2020 Remi Collet - 2.7.3-1 +- update to 2.7.3 +- allow doctrine/common v3 +- allow doctrine/persistence v2 +- add dependency on doctrine/inflector +- add dependency on doctrine/lexer + * Wed Mar 25 2020 Remi Collet - 2.7.2-1 - update to 2.7.2 -- cgit