diff options
Diffstat (limited to 'php-doctrine-orm.spec')
| -rw-r--r-- | php-doctrine-orm.spec | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 7f9cfb8..7001f5a 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.9.6 -%global github_commit 5f768742a0461327bebe0fd11012bbd69e29a311 +%global github_version 2.10.0 +%global github_commit 07e15a00382982dc8088093669108d2174e456ea %global composer_vendor doctrine %global composer_project orm @@ -61,6 +61,10 @@ # "symfony/cache": "^4.4 || ^5.2", %global sym_cache_min_ver 4.4 %global sym_cache_max_ver 6 +# "symfony/polyfill-php72": "^1.23", +# "symfony/polyfill-php80": "^1.15" +%global sym_poly_min_ver 1.23 +%global sym_poly_max_ver 2 # "psr/cache": "^1 || ^2 || ^3", %global psr_cache_min_ver 1 %global psr_cache_max_ver 4 @@ -110,8 +114,9 @@ BuildRequires: (php-composer(doctrine/persistence) >= %{persistence_min_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}) 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}) -# remirepo:32 +# remirepo:34 %else BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -141,6 +146,8 @@ 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} BuildRequires: php-composer(symfony/cache) >= %{sym_cache_min_ver} +BuildRequires: php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver} +BuildRequires: php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver} BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver} %endif @@ -165,7 +172,6 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) Requires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_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}) @@ -177,13 +183,12 @@ Requires: (php-composer(doctrine/event-manager) >= %{event_min_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}) +Requires: (php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} with php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver}) Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) # composer.json: suggest Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) # remirepo:30 %else -Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} -Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} Requires: php-composer(doctrine/cache) < %{cache_max_ver} Requires: php-composer(doctrine/cache) >= %{cache_min_ver} Requires: php-composer(doctrine/collections) < %{collections_max_ver} @@ -208,6 +213,8 @@ Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/yaml) < %{symfony_max_ver} Requires: php-composer(symfony/yaml) >= %{symfony_min_ver} +Requires: php-composer(symfony/polyfill-php80) < %{sym_poly_max_ver} +Requires: php-composer(symfony/polyfill-php80) >= %{sym_poly_min_ver} Requires: php-composer(psr/cache) < %{psr_cache_max_ver} Requires: php-composer(psr/cache) >= %{psr_cache_min_ver} %endif @@ -310,6 +317,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Psr/Cache2/autoload.php', '%{phpdir}/Psr/Cache/autoload.php', ], + '%{phpdir}/Symfony/Polyfill/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ @@ -349,6 +357,7 @@ cat > bootstrap.php <<'BOOTSTRAP' <?php require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php'; \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Doctrine/Common/Annotations/autoload.php', [ '%{phpdir}/Symfony5/Component/Cache/autoload.php', '%{phpdir}/Symfony4/Component/Cache/autoload.php', @@ -361,12 +370,12 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for CMDARG in "php %{phpunit}" php73 php74 php80; do +for CMDARG in "php %{phpunit}" php73 php74 php80 php81; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ --verbose -d memory_limit="512M" \ - --filter '^((?!(testConfigureCache)).)*$' \ + --filter '^((?!(testConfigureCache|testDecimal)).)*$' \ --bootstrap bootstrap.php \ || RETURN_CODE=1 fi @@ -388,6 +397,11 @@ exit $RETURN_CODE %changelog +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.10.0-1 +- update to 2.10.0 +- drop dependency on doctrine/annotations +- add dependency on symfony/polyfill-php80 + * Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.9.6-1 - update to 2.9.6 |