diff options
Diffstat (limited to 'php-doctrine-orm.spec')
-rw-r--r-- | php-doctrine-orm.spec | 79 |
1 files changed, 58 insertions, 21 deletions
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 9c043b4..c6fedb6 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-orm # -# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2023 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name orm -%global github_version 2.13.1 -%global github_commit 35c44a56677adb3ce796138b6e4934ce93ec6811 +%global github_version 2.14.1 +%global github_commit de7eee5ed7b1b35c99b118f26f210a8281e6db8e %global composer_vendor doctrine %global composer_project orm @@ -27,9 +27,9 @@ # "doctrine/cache": "^1.12.1 || ^2.1.1" %global cache_min_ver 1.12.1 %global cache_max_ver 3 -# "doctrine/collections": "^1.5" +# "doctrine/collections": "^1.5 || ^2.0" %global collections_min_ver 1.5 -%global collections_max_ver 2 +%global collections_max_ver 3 # "doctrine/common": "^3.0.3" %global common_min_ver 3.0.3 %global common_max_ver 4 @@ -45,18 +45,19 @@ # "doctrine/instantiator": "^1.3" %global instantiator_min_ver 1.3 %global instantiator_max_ver 2 -# "doctrine/lexer": "^1.2.3" +# "doctrine/lexer": "^1.2.3 || ^2" %global lexer_min_ver 1.2.3 -%global lexer_max_ver 2 +%global lexer_max_ver 3 # "doctrine/persistence": "^2.4 || ^3" %global persistence_min_ver 2.4 %global persistence_max_ver 4 -# "doctrine/event-manager": "^1.1" -%global event_min_ver 1.1 -%global event_max_ver 2 -# "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0" +# "doctrine/event-manager": "^1.2 || ^2.0" +%global event_min_ver 1.2 +%global event_max_ver 3 +# "symfony/console": "^4.2 || ^5.0 || ^6.0" # "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0" -%global symfony_min_ver 3.4 +# "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", +%global symfony_min_ver 4.4 %global symfony_max_ver 7 # "symfony/cache": "^4.4 || ^5.4 || ^6.0", %global sym_cache_min_ver 4.4 @@ -115,12 +116,13 @@ BuildRequires: (php-composer(doctrine/event-manager) >= %{event_min_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/var-exporter) >= %{symfony_min_ver} with php-composer(symfony/var-exporter) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/cache) >= %{sym_cache_min_ver} with php-composer(symfony/cache) < %{sym_cache_max_ver}) BuildRequires: (php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} with php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver}) BuildRequires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) -# remirepo:34 +# remirepo:36 %else BuildRequires: php-doctrine-annotations >= %{annotations_min_ver} BuildRequires: php-composer(doctrine/cache) < %{cache_max_ver} @@ -144,6 +146,8 @@ BuildRequires: php-composer(doctrine/persistence) < %{persistence_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{persistence_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/var-exporter) < %{symfony_max_ver} +BuildRequires: php-composer(symfony/var-exporter) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/yaml) < %{symfony_max_ver} BuildRequires: php-composer(symfony/yaml) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/cache) < %{sym_cache_max_ver} @@ -279,7 +283,7 @@ sed -e 's/@VERSION@/%{version}/' -i \ tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php find lib -name \*.rpm\? -delete -: move schema in librari +: move schema in library cp doctrine-mapping.xsd lib/Doctrine/ORM/Mapping/Driver/ sed -e '/doctrine-mapping.xsd/s:/../../../../..::' \ -i lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -301,6 +305,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ [ + '%{phpdir}/Doctrine/Common/Lexer2/autoload.php', + '%{phpdir}/Doctrine/Common/Lexer/autoload.php', + ], [ '%{phpdir}/Doctrine/Persistence3/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', ], @@ -309,16 +316,18 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; [ '%{phpdir}/Doctrine/Common/Cache2/autoload.php', '%{phpdir}/Doctrine/Common/Cache/autoload.php', + ], [ + '%{phpdir}/Doctrine/Common/Collections2/autoload.php', + '%{phpdir}/Doctrine/Common/Collections/autoload.php', ], - '%{phpdir}/Doctrine/Common/Collections/autoload.php', '%{phpdir}/Doctrine/Deprecations/autoload.php', [ '%{phpdir}/Doctrine/Inflector2/autoload.php', '%{phpdir}/Doctrine/Common/Inflector/autoload.php', - ], - '%{phpdir}/Doctrine/Common/EventManager/autoload.php', - '%{phpdir}/Doctrine/Common/Lexer/autoload.php', - [ + ], [ + '%{phpdir}/Doctrine/EventManager2/autoload.php', + '%{phpdir}/Doctrine/Common/EventManager/autoload.php', + ], [ '%{phpdir}/Doctrine/DBAL3/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', ], @@ -338,11 +347,17 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::optional([ [ + '%{phpdir}/Symfony6/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony5/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony4/Component/VarExporter/autoload.php', + '%{phpdir}/Symfony3/Component/VarExporter/autoload.php', + ], [ '%{phpdir}/Symfony6/Component/Yaml/autoload.php', '%{phpdir}/Symfony5/Component/Yaml/autoload.php', '%{phpdir}/Symfony4/Component/Yaml/autoload.php', '%{phpdir}/Symfony3/Component/Yaml/autoload.php', ], + ]); AUTOLOAD @@ -393,12 +408,12 @@ rm tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php : Upstream tests RETURN_CODE=0 -for CMDARG in "php %{phpunit}" php74 php80 php81; do +for CMDARG in "php %{phpunit}" php80 php81 php82; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ --verbose -d memory_limit="512M" \ - --filter '^((?!(testConfigureCache|testDecimal)).)*$' \ + --filter '^((?!(testConfigureCache|testDecimal|testCacheNamespaceShouldBeGeneratedForApcu)).)*$' \ --bootstrap bootstrap.php \ || RETURN_CODE=1 fi @@ -420,6 +435,28 @@ exit $RETURN_CODE %changelog +* Tue Jan 17 2023 Remi Collet <remi@remirepo.net> - 2.14.1-1 +- update to 2.14.1 + +* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.14.0-1 +- update to 2.14.0 +- allow doctrine/collections v2 +- allow doctrine/event-manager v2 +- allow doctrine/lexer v2 +- raise dependency on symfony/console 4.2 + +* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.13.5-1 +- update to 2.13.5 + +* Thu Nov 24 2022 Remi Collet <remi@remirepo.net> - 2.13.4-1 +- update to 2.13.4 + +* Fri Oct 7 2022 Remi Collet <remi@remirepo.net> - 2.13.3-1 +- update to 2.13.3 + +* Fri Sep 23 2022 Remi Collet <remi@remirepo.net> - 2.13.2-1 +- update to 2.13.2 + * Mon Aug 8 2022 Remi Collet <remi@remirepo.net> - 2.13.1-1 - update to 2.13.1 |