diff options
| -rw-r--r-- | composer.json | 22 | ||||
| -rw-r--r-- | php-doctrine-orm.spec | 107 |
2 files changed, 83 insertions, 46 deletions
diff --git a/composer.json b/composer.json index abe42e4..c74e9cf 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "Object-Relational-Mapper for PHP", "keywords": ["orm", "database"], - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/orm.html", "license": "MIT", "authors": [ {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"}, @@ -18,18 +18,20 @@ "require": { "php": "^7.1", "ext-pdo": "*", - "doctrine/annotations": "~1.5", - "doctrine/cache": "~1.6", - "doctrine/collections": "^1.4", - "doctrine/common": "^2.7.1", - "doctrine/dbal": "^2.6", - "doctrine/instantiator": "~1.1", - "symfony/console": "~3.0|~4.0" + "doctrine/annotations": "^1.8", + "doctrine/cache": "^1.9.1", + "doctrine/collections": "^1.5", + "doctrine/common": "^2.11", + "doctrine/dbal": "^2.9.3", + "doctrine/event-manager": "^1.1", + "doctrine/instantiator": "^1.3", + "doctrine/persistence": "^1.2", + "symfony/console": "^3.0|^4.0|^5.0" }, "require-dev": { "doctrine/coding-standard": "^5.0", "phpunit/phpunit": "^7.5", - "symfony/yaml": "~3.4|~4.0" + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -46,7 +48,7 @@ "bin": ["bin/doctrine"], "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "2.7.x-dev" } }, "archive": { diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 326f0c0..d104c2e 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -13,36 +13,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} @@ -55,7 +61,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 @@ -73,15 +79,17 @@ BuildArch: noarch BuildRequires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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}) -# remirepo:18 +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}) +# remirepo:22 %else BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -95,6 +103,10 @@ BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver} BuildRequires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} BuildRequires: php-composer(doctrine/instantiator) >= %{instantiator_min_ver} +BuildRequires: php-composer(doctrine/event-manager) < %{event_max_ver} +BuildRequires: php-composer(doctrine/event-manager) >= %{event_min_ver} +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/yaml) < %{symfony_max_ver} @@ -120,16 +132,18 @@ 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}) -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}) -# remirepo:18 +Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) +# remirepo:22 %else Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -143,6 +157,10 @@ Requires: php-composer(doctrine/dbal) < %{dbal_max_ver} Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} Requires: php-composer(doctrine/instantiator) < %{instantiator_max_ver} Requires: php-composer(doctrine/instantiator) >= %{instantiator_min_ver} +Requires: php-composer(doctrine/event-manager) < %{event_max_ver} +Requires: php-composer(doctrine/event-manager) >= %{event_min_ver} +Requires: php-composer(doctrine/persistence) < %{persistence_max_ver} +Requires: php-composer(doctrine/persistence) >= %{persistence_min_ver} Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/yaml) < %{symfony_max_ver} @@ -217,9 +235,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', ], @@ -227,6 +248,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', ], @@ -288,6 +310,19 @@ exit $RETURN_CODE %changelog +* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 2.6.6-1 - update to 2.6.6 |