diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 28 |
2 files changed, 21 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 1e04061..9d16289 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ ], "require": { "php": "^7.1 || ^8.0", - "doctrine/dbal": "^2.9.0", - "doctrine/persistence": "^1.3.3", + "doctrine/dbal": "^2.9.0|^3.0", + "doctrine/persistence": "^1.3.3|^2.0", "doctrine/sql-formatter": "^1.0.1", "symfony/cache": "^4.3.3|^5.0", "symfony/config": "^4.3.3|^5.0", diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 67f7c06..a06c800 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name DoctrineBundle -%global github_version 2.1.0 -%global github_commit 0fb513842c78b43770597ef3c487cdf79d944db3 +%global github_version 2.1.1 +%global github_commit 22add179ebca928650180c72fe84f2958d0c33b0 %global major 2 %global composer_vendor doctrine @@ -22,12 +22,12 @@ # "php": "^7.1 || ^8.0" %global php_min_ver 7.1 -# "doctrine/dbal": "^2.9.0" +# "doctrine/dbal": "^2.9.0|^3.0" %global dbal_min_ver 2.9 -%global dbal_max_ver 3.0 -# "doctrine/persistence": "^1.3.3", +%global dbal_max_ver 4 +# "doctrine/persistence": "^1.3.3|^2.0", %global persistence_min_ver 1.3.3 -%global persistence_max_ver 2 +%global persistence_max_ver 3 # "doctrine/orm": "~2.6" %global orm_min_ver 2.6 %global orm_max_ver 3.0 @@ -71,7 +71,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Symfony Bundle for Doctrine License: MIT @@ -227,8 +227,13 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Bundle\\DoctrineBundle\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/Doctrine/DBAL/autoload.php', - '%{phpdir}/Doctrine/Persistence/autoload.php', + [ + '%{phpdir}/Doctrine/DBAL3/autoload.php', + '%{phpdir}/Doctrine/DBAL/autoload.php', + ], [ + '%{phpdir}/Doctrine/Persistence2/autoload.php', + '%{phpdir}/Doctrine/Persistence/autoload.php', + ], '%{phpdir}/Doctrine/SqlFormatter/autoload.php', '%{phpdir}/Symfony/Contracts/autoload.php', [ @@ -315,6 +320,11 @@ exit $RETURN_CODE %changelog +* Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1 +- update to 2.1.1 +- allow doctrine/dbal 3.0 +- allow doctrine/persistence 2.0 + * Tue May 26 2020 Remi Collet <remi@remirepo.net> - 2.1.0- - fix dependency and FTBFS #1863700 |