From 597d5b53ffcb6e3f6c426c0991a83fb1b651d7ca Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 14 Jan 2020 11:00:39 +0100
Subject: update to 1.4.1 add dependency on doctrine/persistence 1.3.3

---
 composer.json                  |  5 +++--
 php-doctrine-datafixtures.spec | 22 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index cebc0a9..028ff8f 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
     ],
     "require": {
         "php": "^7.2",
-        "doctrine/common": "^2.11"
+        "doctrine/common": "^2.11",
+        "doctrine/persistence": "^1.3.3"
     },
     "conflict": {
         "doctrine/phpcr-odm": "<1.3.0"
@@ -25,7 +26,7 @@
         "doctrine/coding-standard": "^6.0",
         "doctrine/dbal": "^2.5.4",
         "doctrine/mongodb-odm": "^1.3.0",
-        "doctrine/orm": "^2.5.4",
+        "doctrine/orm": "^2.7.0",
         "phpunit/phpunit": "^7.0"
     },
     "suggest": {
diff --git a/php-doctrine-datafixtures.spec b/php-doctrine-datafixtures.spec
index 6657959..2976938 100644
--- a/php-doctrine-datafixtures.spec
+++ b/php-doctrine-datafixtures.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     doctrine
 %global github_name      data-fixtures
-%global github_version   1.4.0
-%global github_commit    608a35a3b5bcc4214d116603095f8b0c51091592
+%global github_version   1.4.1
+%global github_commit    640ab13b91bac8925af3da94dee4daf96b62a428
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  doctrine
@@ -24,12 +24,15 @@
 # "doctrine/common": "~2.11"
 %global doctrine_common_min_ver 2.11
 %global doctrine_common_max_ver 3.0
-# "doctrine/orm": "^2.5.4"
-%global doctrine_orm_min_ver 2.5.4
+# "doctrine/orm": "^2.7.0"
+%global doctrine_orm_min_ver 2.7.0
 %global doctrine_orm_max_ver 3.0
 # "doctrine/dbal": "^2.5.4"
 %global doctrine_dbal_min_ver 2.5.4
 %global doctrine_dbal_max_ver 3.0
+# "doctrine/persistence": "^1.3.3"
+%global doctrine_pers_min_ver 1.3.3
+%global doctrine_pers_max_ver 2
 # "alcaeus/mongo-php-adapter": "^1.1"
 %global alcaeus_mongo_min_ver 1.1
 %global alcaeus_mongo_max_ver 2
@@ -59,6 +62,7 @@ BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires:(php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
 BuildRequires:(php-composer(doctrine/orm)    >= %{doctrine_orm_min_ver}    with php-composer(doctrine/orm)    < %{doctrine_orm_max_ver})
 BuildRequires:(php-composer(doctrine/dbal)   >= %{doctrine_dbal_min_ver}   with php-composer(doctrine/dbal)   < %{doctrine_dbal_max_ver})
+BuildRequires:(php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}   with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
 BuildRequires:(php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver} with php-composer(alcaeus/mongo-php-adapter) < %{alcaeus_mongo_max_ver})
 # missing doctrine/mongodb-odm
 %else
@@ -68,6 +72,8 @@ BuildRequires: php-composer(doctrine/orm)    <  %{doctrine_orm_max_ver}
 BuildRequires: php-composer(doctrine/orm)    >= %{doctrine_orm_min_ver}
 BuildRequires: php-composer(doctrine/dbal)   < %{doctrine_dbal_max_ver}
 BuildRequires: php-composer(doctrine/dbal)   >= %{doctrine_dbal_min_ver}
+BuildRequires: php-composer(doctrine/persistence) <  %{doctrine_pers_max_ver}
+BuildRequires: php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}
 BuildRequires: php-composer(alcaeus/mongo-php-adapter) <  %{alcaeus_mongo_max_ver}
 BuildRequires: php-composer(alcaeus/mongo-php-adapter) >= %{alcaeus_mongo_min_ver}
 %endif
@@ -84,12 +90,15 @@ BuildRequires: php-composer(fedora/autoloader)
 Requires:      php(language) >= %{php_min_ver}
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:     (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+Requires:     (php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}   with php-composer(doctrine/persistence) < %{doctrine_pers_max_ver})
 # composer.json: optional
 Suggests:      php-composer(alcaeus/mongo-php-adapter)
 # missing option doctrine/mongodb-odm
 %else
 Requires:      php-composer(doctrine/common) <  %{doctrine_common_max_ver}
 Requires:      php-composer(doctrine/common) >= %{doctrine_common_min_ver}
+Requires:      php-composer(doctrine/persistence) <  %{doctrine_pers_max_ver}
+Requires:      php-composer(doctrine/persistence) >= %{doctrine_pers_min_ver}
 %endif
 # phpcompatinfo (computed from version 1.0.2)
 Requires:      php-json
@@ -128,6 +137,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/Common/autoload.php',
+    '%{phpdir}/Doctrine/Persistence/autoload.php',
 ]);
 
 \Fedora\Autoloader\Dependencies::optional([
@@ -178,6 +188,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- update to 1.4.1
+- add dependency on doctrine/persistence 1.3.3
+
 * Wed Nov 13 2019 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - update to 1.4.0
 - raise dependency on PHP 7.2
-- 
cgit