diff options
Diffstat (limited to 'php-doctrine-datafixtures.spec')
| -rw-r--r-- | php-doctrine-datafixtures.spec | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec index cfa2149..0baa25d 100644 --- a/php-doctrine-datafixtures.spec +++ b/php-doctrine-datafixtures.spec @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name data-fixtures -%global github_version 1.5.4 -%global github_commit d25660094fb25ee139aac11c7f052bea169b3f88 +%global github_version 1.6.1 +%global github_commit 1a4232c15143ca3c127812d19b23a7961c41eeed %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor doctrine @@ -21,11 +21,8 @@ # "php": "^7.2 || ^8.0" %global php_min_ver 7.2 -# "doctrine/common": "~2.13|^3.0" -%global doctrine_common_min_ver 2.13 -%global doctrine_common_max_ver 4 -# "doctrine/orm": "^2.7.0" -%global doctrine_orm_min_ver 2.7.0 +# "doctrine/orm": "^2.12" +%global doctrine_orm_min_ver 2.12 %global doctrine_orm_max_ver 3.0 # "doctrine/dbal": "^2.13 || ^3.0" %global doctrine_dbal_min_ver 2.13 @@ -33,6 +30,9 @@ # "doctrine/persistence": "^1.3.3|^2.0|^3.0" %global doctrine_pers_min_ver 1.3.3 %global doctrine_pers_max_ver 4 +# "doctrine/deprecations": "^1.0", +%global doctrine_dep_min_ver 1.0 +%global doctrine_dep_max_ver 2 # Build using "--without tests" to disable tests %bcond_without tests @@ -58,22 +58,23 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-sqlite3 # remirepo:1 %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/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver}) BuildRequires:(php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} with php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver}) +BuildRequires:(php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver}) BuildRequires:(php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}) # missing doctrine/mongodb-odm ^1.3.0 || ^2.0.0 # remirepo:10 %else -BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} -BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} BuildRequires: php-composer(doctrine/orm) < %{doctrine_orm_max_ver} BuildRequires: php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} +BuildRequires: php-composer(doctrine/deprecations) < %{doctrine_dep_max_ver} +BuildRequires: php-composer(doctrine/deprecations) >= %{doctrine_dep_min_ver} BuildRequires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver} BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} %endif +BuildRequires: php-symfony4-cache BuildRequires: phpunit9 ## phpcompatinfo (computed from version 1.0.2) BuildRequires: php-json @@ -87,15 +88,12 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} # remirepo:1 %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/persistence) >= %{doctrine_pers_min_ver} with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver}) # composer.json: optional and deprecated Suggests: php-composer(alcaeus/mongo-php-adapter) # missing option doctrine/mongodb-odm -# remirepo:6 +# remirepo:4 %else -Requires: php-composer(doctrine/common) < %{doctrine_common_max_ver} -Requires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} Requires: php-composer(doctrine/persistence) < %{doctrine_pers_max_ver} Requires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver} %endif @@ -136,9 +134,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ [ - '%{phpdir}/Doctrine/Common3/autoload.php', - '%{phpdir}/Doctrine/Common/autoload.php', - ], [ '%{phpdir}/Doctrine/Persistence3/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', '%{phpdir}/Doctrine/Persistence/autoload.php', @@ -165,10 +160,12 @@ cat << 'BOOTSTRAP' | tee bootstrap.php require_once '%{buildroot}%{phpdir}/Doctrine/Common/DataFixtures/autoload.php'; \Fedora\Autoloader\Autoload::addPsr0('Doctrine\\Tests\\', __DIR__.'/tests'); \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Doctrine/Deprecations/autoload.php', [ '%{phpdir}/Doctrine/DBAL3/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', ], + '%{phpdir}/Symfony4/Component/Cache/autoload.php', ]); BOOTSTRAP @@ -194,12 +191,15 @@ exit $RETURN_CODE %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md -%doc UPGRADE %doc composer.json %{phpdir}/Doctrine/Common/DataFixtures %changelog +* Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- update to 1.6.1 +- drop dependency on doctrine/common + * Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 1.5.4-1 - update to 1.5.4 |