diff options
| -rw-r--r-- | php-doctrine-orm.spec | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index f0d895e..5dff10b 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-orm # -# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2013-2022 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -76,7 +76,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Doctrine Object-Relational-Mapper (ORM) License: MIT @@ -116,18 +116,16 @@ BuildRequires: (php-composer(symfony/yaml) >= %{symfony_min_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:34 +# remirepo:32 %else -BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} -BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} +BuildRequires: php-doctrine-annotations >= %{annotations_min_ver} BuildRequires: php-composer(doctrine/cache) < %{cache_max_ver} BuildRequires: php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: php-composer(doctrine/collections) < %{collections_max_ver} BuildRequires: php-composer(doctrine/collections) >= %{collections_min_ver} BuildRequires: php-composer(doctrine/common) < %{common_max_ver} BuildRequires: php-composer(doctrine/common) >= %{common_min_ver} -BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} -BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +BuildRequires: php-doctrine-dbal >= %{dbal_min_ver} BuildRequires: php-composer(doctrine/deprecations) < %{deprecations_max_ver} BuildRequires: php-composer(doctrine/deprecations) >= %{deprecations_min_ver} BuildRequires: php-composer(doctrine/inflector) < %{inflector_max_ver} @@ -172,6 +170,7 @@ 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}) @@ -189,14 +188,14 @@ Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} Recommends: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) # remirepo:30 %else +Requires: php-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} Requires: php-composer(doctrine/collections) >= %{collections_min_ver} Requires: php-composer(doctrine/common) < %{common_max_ver} Requires: php-composer(doctrine/common) >= %{common_min_ver} -Requires: php-composer(doctrine/dbal) < %{dbal_max_ver} -Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} +Requires: php-doctrine-dbal >= %{dbal_min_ver} Requires: php-composer(doctrine/deprecations) < %{deprecations_max_ver} Requires: php-composer(doctrine/deprecations) >= %{deprecations_min_ver} Requires: php-composer(doctrine/inflector) < %{inflector_max_ver} @@ -291,6 +290,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\ORM\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Doctrine/Common/Annotations/autoload.php', '%{phpdir}/Doctrine/Common3/autoload.php', [ '%{phpdir}/Doctrine/Common/Cache2/autoload.php', @@ -360,7 +360,6 @@ cat > bootstrap.php <<'BOOTSTRAP' <?php require_once '%{buildroot}%{phpdir}/Doctrine/ORM/autoload.php'; \Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/Doctrine/Common/Annotations/autoload.php', [ '%{phpdir}/Symfony6/Component/Cache/autoload.php', '%{phpdir}/Symfony5/Component/Cache/autoload.php', @@ -401,6 +400,10 @@ exit $RETURN_CODE %changelog +* Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 2.11.0-2 +- add missing dependency on doctrine-annotations + see https://github.com/doctrine/orm/pull/9416 + * Wed Jan 12 2022 Remi Collet <remi@remirepo.net> - 2.11.0-1 - update to 2.11.0 |