From 2c1185758b9ed405c87aa9e7c3cdbc65326ab824 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Nov 23 2021 08:26:02 +0000
Subject: update to 2.5.0


allow psr/cache v2 and v3

---

diff --git a/.gitignore b/.gitignore
index 374671c..8e251e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-symfony-contracts2-2.3.1-f7783bd.tar.gz
 /php-symfony-contracts2-2.4.0-8434102.tar.gz
+/php-symfony-contracts2-2.5.0-1f4c95d.tar.gz
diff --git a/php-symfony-contracts2.spec b/php-symfony-contracts2.spec
index d9dc298..65d3496 100644
--- a/php-symfony-contracts2.spec
+++ b/php-symfony-contracts2.spec
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    8434102b404d119dcaf98c8fe19a2655573ac17a
+%global gh_commit    1f4c95d47bddf0c1579779d4b85602c923ed2f1c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     symfony
 %global gh_project   contracts
@@ -25,8 +25,8 @@
 
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.4.0
-Release:        2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
+Version:        2.5.0
+Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A set of abstractions extracted out of the Symfony, version %{major}
 
 License:        MIT
@@ -45,7 +45,7 @@ BuildRequires:  php-spl
 BuildRequires:  php-zlib
 # From composer.json, "require-dev": {
 #        "symfony/polyfill-intl-idn": "^1.10"
-BuildRequires: (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 2)
+BuildRequires: (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 4)
 BuildRequires: (php-composer(psr/container)        >= 1.1  with php-composer(psr/container)        < 2)
 BuildRequires: (php-composer(psr/event-dispatcher) >= 1.0  with php-composer(psr/event-dispatcher) < 2)
 %if 0%{?fedora} >= 31 || 0%{?rhel} >=9
@@ -70,7 +70,7 @@ Requires:       php(language) >= 7.2.5
 #        "symfony/http-client-implementation": "",
 #        "symfony/service-implementation": "",
 #        "symfony/translation-implementation": ""
-Requires:      (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 2)
+Requires:      (php-composer(psr/cache)            >= 1.0  with php-composer(psr/cache)            < 4)
 Requires:      (php-composer(psr/container)        >= 1.1  with php-composer(psr/container)        < 2)
 Requires:      (php-composer(psr/event-dispatcher) >= 1.0  with php-composer(psr/event-dispatcher) < 2)
 # From phpcompatinfo report for version 2.3.1
@@ -122,7 +122,11 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Psr/Cache/autoload.php',
+    [
+        '%{php_home}/Psr/Cache3/autoload.php',
+        '%{php_home}/Psr/Cache2/autoload.php',
+        '%{php_home}/Psr/Cache/autoload.php',
+    ],
     '%{php_home}/Psr/Container/autoload.php',
     '%{php_home}/Psr/EventDispatcher/autoload.php',
     __DIR__ . '/Deprecation/function.php',
@@ -145,10 +149,11 @@ mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
 require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\Fixtures\\', dirname(__DIR__)."/Tests/Fixtures/");
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} \
@@ -171,6 +176,10 @@ exit $ret
 
 
 %changelog
+* Tue Nov 23 2021 Remi Collet <remi@remirepo.net> - 2.5.0-1
+- update to 2.5.0
+- allow psr/cache v2 and v3
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index bd13475..d66f4c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-symfony-contracts2-2.4.0-8434102.tar.gz) = 2c47d4673af8fd3ef626b3b22ecfe45ea2daef2395748f34cd9e1b2b5087c9d56b5c8f58f02e8965c119b652e45b4a3feebd89b5f7dbbd91c955cbbe7ef22813
+SHA512 (php-symfony-contracts2-2.5.0-1f4c95d.tar.gz) = 0f3b2f913458074b5d6f3d311d16eb2238f7627557b70f2f9354d00c1f52090035ae39873a525b49b55e6e2acdfc86c6b27d27a4103c630d44a609b5b2e125e7