summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-11-28 11:45:24 +0100
committerRemi Collet <remi@remirepo.net>2019-11-28 11:45:24 +0100
commitefb6ae129aeac549955a57d1c8ebf18fea5b86d0 (patch)
tree5f4c17baef323cf3367f27ec3b95ba482f40c3a7
parent2c14dfe5c833e01775217b084f6c22093e9cc840 (diff)
- update to 1.12.1HEADmaster
- add dependency on symfony/cache
-rw-r--r--composer.json3
-rw-r--r--php-doctrine-doctrine-bundle.spec20
2 files changed, 17 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 9ad06ef..a5b6215 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
"keywords": ["DBAL", "ORM", "Database", "Persistence"],
"homepage": "http://www.doctrine-project.org",
"license": "MIT",
+ "minimum-stability": "dev",
"authors": [
{
"name": "Fabien Potencier",
@@ -28,6 +29,7 @@
"doctrine/dbal": "^2.5.12",
"doctrine/doctrine-cache-bundle": "~1.2",
"jdorn/sql-formatter": "^1.2.16",
+ "symfony/cache": "^3.4.30|^4.3.3",
"symfony/config": "^3.4.30|^4.3.3",
"symfony/console": "^3.4.30|^4.3.3",
"symfony/dependency-injection": "^3.4.30|^4.3.3",
@@ -39,7 +41,6 @@
"doctrine/orm": "^2.6",
"php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^7.5",
- "symfony/cache": "^3.4.30|^4.3.3",
"symfony/phpunit-bridge": "^4.2",
"symfony/property-info": "^3.4.30|^4.3.3",
"symfony/twig-bridge": "^3.4|^4.1",
diff --git a/php-doctrine-doctrine-bundle.spec b/php-doctrine-doctrine-bundle.spec
index 63f21aa..825c2bd 100644
--- a/php-doctrine-doctrine-bundle.spec
+++ b/php-doctrine-doctrine-bundle.spec
@@ -12,8 +12,8 @@
%global github_owner doctrine
%global github_name DoctrineBundle
-%global github_version 1.12.0
-%global github_commit a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115
+%global github_version 1.12.1
+%global github_commit 1035bdda574f6beb39468c9a6b6066f5368a6b18
%global composer_vendor doctrine
%global composer_project doctrine-bundle
@@ -32,6 +32,7 @@
# "jdorn/sql-formatter": "^1.2.16"
%global sql_formatter_min_ver 1.2.16
%global sql_formatter_max_ver 2.0
+# "symfony/cache": "^3.4.30|^4.3.3",
# "symfony/config": "^3.4.30|^4.3.3",
# "symfony/console": "^3.4.30|^4.3.3"
# "symfony/dependency-injection": "^3.4.30|^4.3.3"
@@ -99,13 +100,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}
@@ -128,12 +129,13 @@ Requires: php(language) >= %{php_min_ver}
Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver})
Requires: (php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_min_ver} with php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_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:18
+# remirepo:20
%else
Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver}
Requires: php-composer(doctrine/dbal) < %{dbal_max_ver}
@@ -141,6 +143,8 @@ Requires: php-composer(doctrine/doctrine-cache-bundle) >= %{cache_bundle_mi
Requires: php-composer(doctrine/doctrine-cache-bundle) < %{cache_bundle_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}
@@ -214,6 +218,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',
], [
@@ -248,7 +255,6 @@ phpab -o bs.php Tests/DependencyInjection
cat << 'EOF' | tee -a bs.php
require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle/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',
@@ -285,6 +291,10 @@ exit $RETURN_CODE
%changelog
+* Thu Nov 28 2019 Remi Collet <remi@remirepo.net> - 1.12.1-1
+- update to 1.12.1
+- add dependency on symfony/cache
+
* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.12.0-1
- update to 1.12.0
- add dependency on symfony/config