- update to 2.0.2

- add dependency on symfony/cache

2 files changed, 16 insertions, 7 deletions

diff --git a/composer.json b/composer.json
index c46a259..cbdb76b 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
         "php": "^7.1",
         "doctrine/dbal": "^2.9.0",
         "jdorn/sql-formatter": "^1.2.16",
+        "symfony/cache": "^4.3.3|^5.0",
         "symfony/config": "^4.3.3|^5.0",
         "symfony/console": "^3.4.30|^4.3.3|^5.0",
         "symfony/dependency-injection": "^4.3.3|^5.0",
@@ -38,7 +39,6 @@
         "doctrine/coding-standard": "^6.0",
         "doctrine/orm": "^2.6",
         "phpunit/phpunit": "^7.5",
-        "symfony/cache": "^3.4.30|^4.3.3|^5.0",
         "symfony/phpunit-bridge": "^4.2",
         "symfony/property-info": "^4.3.3|^5.0",
         "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0",
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 804de82..4932dbb 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.0.0
-%global github_commit    82826278bb88ae8c20aee3af3191430dcbcca63a
+%global github_version   2.0.2
+%global github_commit    f96fac225563f5b3b4eeb2f80eb982b7f56484d8
 %global major            2
 
 %global composer_vendor  doctrine
@@ -36,7 +36,7 @@
 # "symfony/dependency-injection": "^^4.3.3|^5.0"
 # "symfony/doctrine-bridge": "^4.3.7|^5.0"
 # "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0"
-# "symfony/cache": "^3.4.30|^4.3.3|^5.0",
+# "symfony/cache": "^4.3.3|^5.0",
 # "symfony/property-info": "^4.3.3|^5.0"
 # "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0",
 # "symfony/validator": "^3.4.30|^4.3.3|^5.0"
@@ -95,13 +95,13 @@ BuildRequires: php-composer(twig/twig)                      >= %{twig_min_ver}
 %endif
 # ensure same version of all components is used
 # "require"
+BuildRequires: php-symfony4-cache                 >= %{symfony_br_ver}
 BuildRequires: php-symfony4-config                >= %{symfony_br_ver}
 BuildRequires: php-symfony4-console               >= %{symfony_br_ver}
 BuildRequires: php-symfony4-dependency-injection  >= %{symfony_br_ver}
 BuildRequires: php-symfony4-doctrine-bridge       >= %{symfony_br_ver}
 BuildRequires: php-symfony4-framework-bundle      >= %{symfony_br_ver}
 # "require-dev"
-BuildRequires: php-symfony4-cache                 >= %{symfony_br_ver}
 BuildRequires: php-symfony4-property-info         >= %{symfony_br_ver}
 BuildRequires: php-symfony4-twig-bridge           >= %{symfony_br_ver}
 BuildRequires: php-symfony4-validator             >= %{symfony_br_ver}
@@ -123,17 +123,20 @@ Requires:      php(language)                                >= %{php_min_ver}
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:     (php-composer(doctrine/dbal)                  >= %{dbal_min_ver}          with php-composer(doctrine/dbal)                  <  %{dbal_max_ver})
 Requires:     (php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver} with php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver})
+Requires:     (php-composer(symfony/cache)                  >= %{symfony_min_ver}       with php-composer(symfony/cache)                  <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/config)                 >= %{symfony_min_ver}       with php-composer(symfony/config)                 <  %{symfony_max_ver})
 Requires:     (php-composer(symfony/console)                >= %{symfony_min_ver}       with php-composer(symfony/console)                <  %{symfony_max_ver})
 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:16
+# remirepo:18
 %else
 Requires:      php-composer(doctrine/dbal)                  >= %{dbal_min_ver}
 Requires:      php-composer(doctrine/dbal)                  <  %{dbal_max_ver}
 Requires:      php-composer(jdorn/sql-formatter)            >= %{sql_formatter_min_ver}
 Requires:      php-composer(jdorn/sql-formatter)            <  %{sql_formatter_max_ver}
+Requires:      php-composer(symfony/cache)                  >= %{symfony_min_ver}
+Requires:      php-composer(symfony/cache)                  <  %{symfony_max_ver}
 Requires:      php-composer(symfony/config)                 >= %{symfony_min_ver}
 Requires:      php-composer(symfony/config)                 <  %{symfony_max_ver}
 Requires:      php-composer(symfony/console)                >= %{symfony_min_ver}
@@ -206,6 +209,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
         '%{phpdir}/Symfony4/Bundle/FrameworkBundle/autoload.php',
         '%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php',
     ], [
+        '%{phpdir}/Symfony4/Component/Cache/autoload.php',
+        '%{phpdir}/Symfony3/Component/Cache/autoload.php',
+    ], [
         '%{phpdir}/Symfony4/Component/Config/autoload.php',
         '%{phpdir}/Symfony3/Component/Config/autoload.php',
     ], [
@@ -240,7 +246,6 @@ phpab -o bs.php Tests/DependencyInjection
 cat << 'EOF' | tee -a bs.php
 require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle%{major}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Symfony4/Component/Cache/autoload.php',
     '%{phpdir}/Symfony4/Component/PropertyInfo/autoload.php',
     '%{phpdir}/Symfony4/Component/Validator/autoload.php',
     '%{phpdir}/Symfony4/Component/Yaml/autoload.php',
@@ -278,6 +283,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- update to 2.0.2
+- add dependency on symfony/cache
+
 * Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 2.0.0-1
 - update to 2.0.0
 - rename to php-doctrine-doctrine-bundle2