From 3154072831c38a3c4412d3a2aa77f15ad6dea5da Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Nov 2021 12:36:32 +0100
Subject: [PATCH] v2.2.2

(cherry picked from commit ef7d3edba9531d5ff05b263470c53da7bbc0e516)
---
 .gitignore          |  1 +
 php-sabre-uri2.spec | 28 ++++++++++++++++------------
 sources             |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ecb4b83..202271a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /php-sabre-uri2-2.1.3-18f4543.tgz
 /php-sabre-uri2-2.2.0-059d110.tgz
 /php-sabre-uri2-2.2.1-f502edf.tgz
+/php-sabre-uri2-2.2.2-7cb0f48.tgz
diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec
index e30f8ff..ca5c934 100644
--- a/php-sabre-uri2.spec
+++ b/php-sabre-uri2.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-sabre-uri2
 #
-# Copyright (c) 2016-2020 Remi Collet
+# Copyright (c) 2016-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    f502edffafea8d746825bd5f0b923a60fd2715ff
+%global gh_commit    7cb0f489578afad5006e85cd60f18ff33f2d440d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   uri
@@ -24,8 +24,8 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Summary:        Functions for making sense out of URIs
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 License:        BSD
@@ -37,17 +37,12 @@ BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  php(language) >= 7.1
 # From composer.json, "require-dev": {
-#        "friendsofphp/php-cs-fixer": "~2.16.1",
+#        "friendsofphp/php-cs-fixer": "~2.17.1",
 #        "phpstan/phpstan": "^0.12",
 #        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
 BuildRequires:  php-pcre
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
 BuildRequires:  phpunit9
 %global phpunit %{_bindir}/phpunit9
-%else
-BuildRequires:  phpunit8 >= 8.5
-%global phpunit %{_bindir}/phpunit8
-%endif
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -105,14 +100,20 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}
 
 
 %check
+: Check version
+php -r '
+require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php";
+echo  Sabre\Uri\Version::VERSION . "\n";
+exit (Sabre\Uri\Version::VERSION === "%{version}" ? 0 : 1);
+'
+
 %if %{with tests}
 : Run upstream test suite against installed library
 mkdir vendor
 ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php
 
 cd tests
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80
-do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -133,6 +134,9 @@ exit $ret
 
 
 %changelog
+* Thu Nov  4 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1
+- update to 2.2.2
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index f202c1f..b9108c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sabre-uri2-2.2.1-f502edf.tgz) = 51fe6e32bbe81d7dccbb52a0d5d8374a7c6005034353494004baa1e3394838906174d1ddae46485b6e433bccd5d7021ac4abc2b6ccef50af0a4ff390c22840cd
+SHA512 (php-sabre-uri2-2.2.2-7cb0f48.tgz) = 59b583f066beea0e06ea83f2d7228470bb931e1728f0fad1e3121713a54092c5e3432c09e8030084d02e0254ca6bfed93322d7d7b5c955a867cd05e9100f0fc4