From 2424e9380947a5bcfb9ee8d63b26fe83b4227a73 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Nov 2018 10:04:38 +0100 Subject: v2.6.3 --- php-doctrine-orm.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'php-doctrine-orm.spec') diff --git a/php-doctrine-orm.spec b/php-doctrine-orm.spec index 342f784..9836e88 100644 --- a/php-doctrine-orm.spec +++ b/php-doctrine-orm.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name doctrine2 -%global github_version 2.6.2 -%global github_commit d2b4dd71d2a276edd65d0c170375b445f8a4a4a8 +%global github_version 2.6.3 +%global github_commit 434820973cadf2da2d66e7184be370084cc32ca8 %global composer_vendor doctrine %global composer_project orm @@ -66,13 +66,13 @@ Source1: %{name}-get-source.sh # 1) Add she-bang # 2) Auto-load using Doctrine\Common\ClassLoader Patch0: %{name}-bin.patch -Patch1: %{name}-php73.patch BuildArch: noarch # Tests %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) BuildRequires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_ver}) @@ -82,6 +82,7 @@ BuildRequires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} w BuildRequires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} with php-composer(doctrine/instantiator) < %{instantiator_max_ver}) BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) +# remirepo:18 %else BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -118,6 +119,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +# remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) Requires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_ver}) @@ -128,6 +130,7 @@ Requires: (php-composer(doctrine/instantiator) >= %{instantiator_min_ver} w Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) # composer.json: suggest Requires: (php-composer(symfony/yaml) >= %{symfony_min_ver} with php-composer(symfony/yaml) < %{symfony_max_ver}) +# remirepo:18 %else Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} @@ -194,7 +197,6 @@ Autoloader: %{phpdir}/Doctrine/ORM/autoload.php : Patch bin script %patch0 -p1 -b .rpm sed -i 's#__PHPDIR__#%{phpdir}#g' bin/doctrine.php -%patch1 -p1 : Remove empty file rm -f lib/Doctrine/ORM/README.markdown @@ -286,6 +288,9 @@ exit $RETURN_CODE %changelog +* Thu Nov 22 2018 Remi Collet - 2.6.3-1 +- update to 2.6.3 + * Wed Oct 17 2018 Remi Collet - 2.6.2-1 - update to 2.6.2 - raise dependency on PHP 7.1 -- cgit