diff --git a/.gitignore b/.gitignore index 9d71bee..df83f0f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /php-doctrine-orm-2.6.4-b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43.tar.gz /php-doctrine-orm-2.6.5-16751d210fb806cc6f1b868a2b9dde6fab6866ed.tar.gz /php-doctrine-orm-2.6.6-2d9b9351831d1230881c52f006011cbf72fe944e.tar.gz +/php-doctrine-orm-2.7.0-4d763ca4c925f647b248b9fa01b5f47aa3685d62.tar.gz diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 9f26c20..5260c7a 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -12,36 +12,42 @@ %global github_owner doctrine %global github_name orm -%global github_version 2.6.6 -%global github_commit 2d9b9351831d1230881c52f006011cbf72fe944e +%global github_version 2.7.0 +%global github_commit 4d763ca4c925f647b248b9fa01b5f47aa3685d62 %global composer_vendor doctrine %global composer_project orm # "php": "^7.1" %global php_min_ver 7.1 -# "doctrine/annotations": "~1.5", -%global annotations_min_ver 1.5 +# "doctrine/annotations": "^1.8", +%global annotations_min_ver 1.8 %global annotations_max_ver 2 -# "doctrine/cache": "~1.6" -%global cache_min_ver 1.6 +# "doctrine/cache": "^1.9.1" +%global cache_min_ver 1.9.1 %global cache_max_ver 2 -# "doctrine/collections": "~1.4" -%global collections_min_ver 1.4 +# "doctrine/collections": "^1.5" +%global collections_min_ver 1.5 %global collections_max_ver 2 -# "doctrine/common": "^2.7.1" -%global common_min_ver 2.7.1 +# "doctrine/common": "^2.11" +%global common_min_ver 2.11 %global common_max_ver 3 -# "doctrine/dbal": "^2.6" -%global dbal_min_ver 2.6 +# "doctrine/dbal": "^2.9.3" +%global dbal_min_ver 2.9.3 %global dbal_max_ver 3 -# "doctrine/instantiator": "^1.1" -%global instantiator_min_ver 1.1 +# "doctrine/instantiator": "^1.3" +%global instantiator_min_ver 1.3 %global instantiator_max_ver 2 -# "symfony/console": "~3.0|~4.0" -# "symfony/yaml": "~3.4|~4.0" +# "doctrine/persistence": "^1.2" +%global persistence_min_ver 1.2 +%global persistence_max_ver 2 +# "doctrine/event-manager": "^1.1" +%global event_min_ver 1.1 +%global event_max_ver 2 +# "symfony/console": "^3.0|^4.0|^5.0" +# "symfony/yaml": "~^3.4|^4.0|^5.0" %global symfony_min_ver 3.4 -%global symfony_max_ver 5 +%global symfony_max_ver 6 %{!?phpdir: %global phpdir %{_datadir}/php} @@ -54,7 +60,7 @@ Release: 1%{?dist} Summary: Doctrine Object-Relational-Mapper (ORM) License: MIT -URL: http://www.doctrine-project.org/projects/orm.html +URL: https://www.doctrine-project.org/projects/orm.html # Run "php-doctrine-orm-get-source.sh" to create source Source0: %{name}-%{version}-%{github_commit}.tar.gz @@ -70,14 +76,16 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) -BuildRequires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_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/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_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}) +BuildRequires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) +BuildRequires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_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/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/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}) BuildRequires: phpunit7 >= 7.5 BuildRequires: php-pdo # phpcompatinfo (computed from version 2.5.11) @@ -96,15 +104,17 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -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}) -Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) -Requires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) -Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +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}) +Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_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/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 -Requires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) +Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) Requires: php-pdo # phpcompatinfo (computed from version 2.5.11) Requires: php-ctype @@ -174,9 +184,12 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Doctrine/Common/autoload.php', '%{phpdir}/Doctrine/Common/Cache/autoload.php', '%{phpdir}/Doctrine/Common/Collections/autoload.php', + '%{phpdir}/Doctrine/Common/EventManager/autoload.php', + '%{phpdir}/Doctrine/Common/Persistence/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', '%{phpdir}/Doctrine/Instantiator/autoload.php', [ + '%{phpdir}/Symfony5/Component/Console/autoload.php', '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', ], @@ -184,6 +197,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::optional([ [ + '%{phpdir}/Symfony5/Component/Yaml/autoload.php', '%{phpdir}/Symfony4/Component/Yaml/autoload.php', '%{phpdir}/Symfony3Component/Yaml/autoload.php', ], @@ -243,6 +257,19 @@ exit $RETURN_CODE %changelog +* Tue Nov 19 2019 Remi Collet - 2.7.0-1 +- update to 2.7.0 +- add dependency on doctrine/event-manager +- add dependency on doctrine/persistence +- raise dependency on doctrine/annotations 1.8 +- raise dependency on doctrine/cache 1.9.1 +- raise dependency on doctrine/collections 1.5 +- raise dependency on doctrine/common 2.11 +- raise dependency on doctrine/dbal 2.9.3 +- raise dependency on doctrine/instantiator 1.3 +- allow Symfony 5 +- symfony/yaml is optional + * Tue Nov 19 2019 Remi Collet - 2.6.6-1 - update to 2.6.6 diff --git a/sources b/sources index b7b0f30..8cc2a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-orm-2.6.6-2d9b9351831d1230881c52f006011cbf72fe944e.tar.gz) = dd6765f2ed2ade066bff1eae100abba0dbcd20d2d3f4f8dac96c2b2708cada21ff6c57791ed5cd8276bde36340f4c83bbc473549befbf8f660c927dc70108b99 +SHA512 (php-doctrine-orm-2.7.0-4d763ca4c925f647b248b9fa01b5f47aa3685d62.tar.gz) = dd113541c1c29bc678df669a62458e81d441e4fc70456ec67a52465c9a7504c67814daf7af3ae5bc5e03afd46f05b96061309f89e17dd744844fbf29ca97b9c5