From f947006e99660649a8fb0d4fd5ecc93c472e6d3b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 3 Jan 2022 13:57:04 +0100
Subject: update to 2.5.4

allow doctrin/orm 3
---
 php-doctrine-doctrine-bundle2.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'php-doctrine-doctrine-bundle2.spec')

diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 7588cd0..6715699 100644
--- a/php-doctrine-doctrine-bundle2.spec
+++ b/php-doctrine-doctrine-bundle2.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-doctrine-doctrine-bundle2
 #
-# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2022 Shawn Iwinski <shawn.iwinski@gmail.com>
 #                         Remi Collet <remi@fedoraproject.org>
 #
 # License: MIT
@@ -13,8 +13,8 @@
 
 %global github_owner     doctrine
 %global github_name      DoctrineBundle
-%global github_version   2.5.2
-%global github_commit    5b77477ba2981a00b423d1bb17084b87eb57a4a5
+%global github_version   2.5.4
+%global github_commit    f6191c50600bad1c0195638413f53aee6158b909
 %global major            2
 
 %global composer_vendor  doctrine
@@ -34,9 +34,9 @@
 # "doctrine/persistence": "^2.2",
 %global persistence_min_ver 2.2
 %global persistence_max_ver 3
-# "doctrine/orm": "~2.9"
+# "doctrine/orm": "~2.9 || ^3.0"
 %global orm_min_ver 2.9
-%global orm_max_ver 3.0
+%global orm_max_ver 4
 # "doctrine/sql-formatter": "^1.0.1"
 %global sql_formatter_min_ver 1.0.1
 %global sql_formatter_max_ver 2.0
@@ -258,8 +258,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Bundle\\DoctrineBundle\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::optional([
-    '%{phpdir}/Doctrine/ORM/autoload.php',
     [
+        '%{phpdir}/Doctrine/ORM3/autoload.php',
+        '%{phpdir}/Doctrine/ORM/autoload.php',
+    ], [
         '%{phpdir}/Symfony4/Bundle/WebProfilerBundle/autoload.php',
         '%{phpdir}/Symfony3/Bundle/WebProfilerBundle/autoload.php',
     ], [
@@ -369,6 +371,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Jan  3 2022 Remi Collet <remi@remirepo.net> - 2.5.4-1
+- update to 2.5.4
+- allow doctrin/orm 3
+
 * Thu Dec  2 2021 Remi Collet <remi@remirepo.net> - 2.5.2-1
 - update to 2.5.2
 - allow symfony/contracts 3
-- 
cgit