From 98dc7776b3164973ff988565c5525008bb181a8a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Sep 2022 08:51:40 +0200 Subject: update to 1.7.2 switch to classmap autoloader add dependency on doctrine/deprecations --- php-doctrine-collections.spec | 51 ++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 15 deletions(-) (limited to 'php-doctrine-collections.spec') diff --git a/php-doctrine-collections.spec b/php-doctrine-collections.spec index 2b16c32..9b51f3e 100644 --- a/php-doctrine-collections.spec +++ b/php-doctrine-collections.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-collections # -# Copyright (c) 2013-2020 Shawn Iwinski +# Copyright (c) 2013-2022 Shawn Iwinski, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -12,14 +12,17 @@ %global github_owner doctrine %global github_name collections -%global github_version 1.6.9 -%global github_commit 1269d42c03f8a1cc9b56a1b727568423268a191b +%global github_version 1.7.2 +%global github_commit 3fe77330f5591108bbf1315da7377a7e704ed8a0 %global composer_vendor doctrine %global composer_project collections # "php": "^7.1.3 || ^8.0" %global php_min_ver 7.1.3 +# "doctrine/deprecations": "^0.5.3 || ^1" +%global doctrine_depr_min_ver 1 +%global doctrine_depr_max_ver 2 # Build using "--without tests" to disable tests %bcond_without tests @@ -46,15 +49,29 @@ BuildArch: noarch %global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} BuildRequires: php(language) >= %{php_min_ver} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(doctrine/deprecations) >= %{doctrine_depr_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_depr_max_ver}) +# remirepo:3 +%else +BuildRequires: php-doctrine-deprecations +%endif ## phpcompatinfo (computed from version 1.6.0) BuildRequires: php-pcre BuildRequires: php-spl -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # composer.json Requires: php(language) >= %{php_min_ver} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(doctrine/deprecations) >= %{doctrine_depr_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_depr_max_ver}) +# remirepo:3 +%else +Requires: php-doctrine-deprecations +%endif # phpcompatinfo (computed from version 1.6.0) Requires: php-pcre Requires: php-spl @@ -79,15 +96,14 @@ Autoloader: %{phpdir}/Doctrine/Common/Collections/autoload.php %build : Create autoloader -cat <<'AUTOLOAD' | tee lib/Doctrine/Common/Collections/autoload.php - - 1.7.2-1 +- update to 1.7.2 +- switch to classmap autoloader +- add dependency on doctrine/deprecations + * Fri Sep 9 2022 Remi Collet - 1.6.9-1 - update to 1.6.9 -- cgit