From 619f3c683f8cbce883c0646a3747b382742c58d7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 8 Mar 2021 12:12:06 +0100
Subject: [PATCH] use range dependencies switch to phpunit8

---
 php-fedora-autoloader.spec | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/php-fedora-autoloader.spec b/php-fedora-autoloader.spec
index 310570a..2031d0b 100644
--- a/php-fedora-autoloader.spec
+++ b/php-fedora-autoloader.spec
@@ -1,7 +1,7 @@
 #
 # Fedora spec file for php-fedora-autoloader
 #
-# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski>
 #                         Remi Collet <remi@fedoraproject.org>
 #
 # License: MIT
@@ -32,7 +32,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Fedora Autoloader
 
 License:       MIT
@@ -45,13 +45,18 @@ BuildArch:     noarch
 BuildRequires: php-cli
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
-%global phpunit %{_bindir}/phpunit6
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+%global phpunit %{_bindir}/phpunit8
 %else
 %global phpunit %{_bindir}/phpunit
 %endif
 BuildRequires: %{phpunit}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:(php-composer(theseer/autoload) >= %{phpab_min_ver} with php-composer(theseer/autoload) < %{phpab_max_ver})
+%else
+BuildRequires: php-composer(theseer/autoload) <  %{phpab_max_ver}
 BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver}
+%endif
 BuildRequires: php-pear
 ## phpcompatinfo (computed from version 1.0.1)
 BuildRequires: php-ctype
@@ -82,8 +87,12 @@ required and optional dependencies.
 Summary: %{name} devel
 
 Requires: %{name} = %{version}-%{release}
-Requires: php-composer(theseer/autoload) >= %{phpab_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:(php-composer(theseer/autoload) >= %{phpab_min_ver} with php-composer(theseer/autoload) < %{phpab_max_ver})
+%else
 Requires: php-composer(theseer/autoload) <  %{phpab_max_ver}
+Requires: php-composer(theseer/autoload) >= %{phpab_min_ver}
+%endif
 
 %description devel
 Provides needed tools to build other packages:
@@ -131,11 +140,11 @@ BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
-for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55 php56} php70 "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6" "php73 %{_bindir}/phpunit6" "php74 %{_bindir}/phpunit6"; do
+for PHP_EXEC in "php %{phpunit}" php73 php74 php80; do
     set $PHP_EXEC
     if [ "php" == "$1" ] || which $PHP_EXEC; then
         $1 -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \
-            ${2:-%{_bindir}/phpunit} \
+            ${2:-%{_bindir}/phpunit8} \
                 --bootstrap bootstrap.php \
                 --verbose
     fi
@@ -159,6 +168,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Mar  8 2021 Remi Collet <remi@remirepo.net> - 1.0.1-5
+- use range dependencies
+- switch to phpunit8
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild