From c8ea6bfcb98bc2ee964b8d19786753116a2e2a6a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Nov 2021 08:04:20 +0100
Subject: [PATCH] v5.1.3

(cherry picked from commit 9b414cd786974a1fa73a52647af8ff21cbf36959)
---
 .gitignore            |  1 +
 php-sabre-event5.spec | 26 +++++++++++++-------------
 sources               |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ac3d48..fa8e402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /php-sabre-event5-5.1.0-d00a175.tgz
 /php-sabre-event5-5.1.1-a37c73e.tgz
 /php-sabre-event5-5.1.2-c120bec.tgz
+/php-sabre-event5-5.1.3-6d86fd1.tgz
diff --git a/php-sabre-event5.spec b/php-sabre-event5.spec
index 27b90a3..e50a8a0 100644
--- a/php-sabre-event5.spec
+++ b/php-sabre-event5.spec
@@ -6,8 +6,11 @@
 #
 # Please, preserve the changelog entries
 #
+
+%bcond_without      tests
+
 # Github
-%global gh_commit    c120bec57c17b6251a496efc82b732418b49d50a
+%global gh_commit    6d86fd14779c58e956f0b2b0496cf3f7f06da177
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   event
@@ -19,12 +22,11 @@
 %global ns_project   Event
 # For RPM
 %global major        5
-%global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Summary:        Lightweight library for event-based programming
-Version:        5.1.2
-Release:        2%{?dist}
+Version:        5.1.3
+Release:        1%{?dist}
 
 URL:            http://sabre.io/event
 License:        BSD
@@ -32,20 +34,15 @@ Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-spl
 # 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"
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
 BuildRequires:  phpunit9
 %global phpunit %{_bindir}/phpunit9
-%else
-BuildRequires:  phpunit8
-%global phpunit %{_bindir}/phpunit8
-%endif
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -101,10 +98,10 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Run upstream test suite against installed library
 ret=0
-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} \
@@ -128,6 +125,9 @@ exit $ret
 
 
 %changelog
+* Thu Nov  4 2021 Remi Collet <remi@remirepo.net> - 5.1.3-1
+- update to 5.1.3
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 01f8dd8..ffda8aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sabre-event5-5.1.2-c120bec.tgz) = 6fd10a49d961af36ca36c2dc3ea08ea5a4144b82fe19c88d2aab31bc7739b67071aa06ba8782012f40de3b8781e0db17cb769663fe9f7067ca197c38d9ccb757
+SHA512 (php-sabre-event5-5.1.3-6d86fd1.tgz) = 6fb88fd48e1fa8a038966b6b8e54450368f2ca22ba7ff4b240aae866f3ef8c42fbaa9f22932dd5cf23fc1ca3b500b6057bac7f4c0335b876a6e83cf46372f994