update to 2.4.3

add dependency on doctrine/annotations

2 files changed, 20 insertions, 5 deletions

diff --git a/composer.json b/composer.json
index 6bbb041..57fcd90 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,7 @@
     ],
     "require": {
         "php": "^7.1 || ^8.0",
+        "doctrine/annotations": "^1",
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/dbal": "^2.9.0|^3.0",
         "doctrine/persistence": "^1.3.3|^2.0",
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 3773436..8c26271 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.4.2
-%global github_commit    4202ce675d29e70a8b9ee763bec021b6f44caccb
+%global github_version   2.4.3
+%global github_commit    62a188ce2192e6b3b7a2019c26c5001778818b83
 %global major            2
 
 %global composer_vendor  doctrine
@@ -22,6 +22,9 @@
 
 # "php": "^7.1 || ^8.0"
 %global php_min_ver 7.1
+#        "doctrine/annotations": "^1",
+%global annotations_min_ver 1
+%global annotations_max_ver 2
 # "doctrine/cache": "^1.11|^2.0"
 %global cache_min_ver 1.11
 %global cache_max_ver 3
@@ -92,6 +95,7 @@ BuildRequires: php(language)                                >= %{php_min_ver}
 BuildRequires: php-theseer-autoload
 # 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/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  < %{dbal_max_ver})
 BuildRequires:(php-composer(doctrine/orm)                   >= %{orm_min_ver}           with php-composer(doctrine/orm)                   < %{orm_max_ver})
@@ -101,8 +105,10 @@ BuildRequires:(php-composer(symfony/deprecation-contracts)  >= %{contracts_min_v
 BuildRequires:(php-composer(symfony/service-contracts)      >= %{contracts_min_ver}     with php-composer(symfony/service-contracts)      < %{contracts_max_ver})
 BuildRequires:(php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} with php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver})
 BuildRequires:(php-composer(twig/twig)                      >= %{twig_min_ver}          with php-composer(twig/twig)                      < %{twig_max_ver})
-# remirepo:20
+# remirepo:22
 %else
+BuildRequires: php-composer(doctrine/annotations)           < %{annotations_max_ver}
+BuildRequires: php-composer(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/dbal)                  <  %{dbal_max_ver}
@@ -157,6 +163,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/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  <  %{dbal_max_ver})
 Requires:     (php-composer(doctrine/persistence)           >= %{persistence_min_ver}   with php-composer(doctrine/persistence)           <  %{persistence_max_ver})
@@ -169,8 +176,10 @@ Requires:     (php-composer(symfony/service-contracts)      >= %{contracts_min_v
 Requires:     (php-composer(symfony/dependency-injection)   >= %{symfony_min_ver}       with php-composer(symfony/dependency-injection)   <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/doctrine-bridge)        >= %{symfony_min_ver}       with php-composer(symfony/doctrine-bridge)        <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/framework-bundle)       >= %{symfony_min_ver}       with php-composer(symfony/framework-bundle)       <  %{symfony_max_ver})
-# remirepo:26
+# remirepo:28
 %else
+Requires:      php-composer(doctrine/annotations)           <  %{annotations_max_ver}
+Requires:      php-composer(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/dbal)                  >= %{dbal_min_ver}
@@ -260,6 +269,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
     ],
 ]);
 \Fedora\Autoloader\Dependencies::required([
+    '%{phpdir}/Doctrine/Common/Annotations/autoload.php',
     [
         '%{phpdir}/Doctrine/Common/Cache2/autoload.php',
         '%{phpdir}/Doctrine/Common/Cache/autoload.php',
@@ -332,7 +342,7 @@ rm Tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php
 
 : Upstream tests with SCLs if available
 RETURN_CODE=0
-for CMDARG in "php %{phpunit}" php73 php74 php80; do
+for CMDARG in "php %{phpunit}" php73 php74 php80 php81; do
     if which $CMDARG; then
         set $CMDARG
         $1 ${2:-%{_bindir}/phpunit9} \
@@ -359,6 +369,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Oct  4 2021 Remi Collet <remi@remirepo.net> - 2.4.3-1
+- update to 2.4.3
+- add dependency on doctrine/annotations
+
 * Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 2.4.2-1
 - update to 2.4.2