From c84f12476ced3ee90a9de6c48b05fd17123cc914 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Aug 2020 14:03:28 +0200 Subject: fix dependency and FTBFS #1863700 --- php-doctrine-doctrine-bundle2.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 43a3b19..67f7c06 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -71,7 +71,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symfony Bundle for Doctrine License: MIT @@ -91,7 +91,7 @@ BuildRequires: php-theseer-autoload %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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}) -BuildRequires:(php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{orm_max_ver}) +BuildRequires:(php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) BuildRequires:(php-composer(doctrine/sql-formatter) >= %{sql_formatter_min_ver} with php-composer(doctrine/sql-formatter) < %{sql_formatter_max_ver}) BuildRequires:(php-composer(symfony/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_max_ver}) BuildRequires:(php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver}) @@ -143,12 +143,12 @@ Requires: php(language) >= %{php_min_ver} # remirepo:1 %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(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{orm_max_ver}) +Requires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) Requires: (php-composer(doctrine/sql-formatter) >= %{sql_formatter_min_ver} with php-composer(doctrine/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/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_max_ver}) +Requires: (php-composer(symfony/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_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}) @@ -315,6 +315,9 @@ exit $RETURN_CODE %changelog +* Tue May 26 2020 Remi Collet - 2.1.0- +- fix dependency and FTBFS #1863700 + * Tue May 26 2020 Remi Collet - 2.1.0-1 - update to 2.1.0 - switch from jdorn/sql-formatter to doctrine/sql-formatter -- cgit