From f01d84647a46a978c6b47058b7cbd9d2b5e0745b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mar 23 2021 10:42:29 +0000 Subject: switch to phpunit9 --- diff --git a/php-webimpress-http-middleware-compatibility.spec b/php-webimpress-http-middleware-compatibility.spec index 5840a55..cad2a4f 100644 --- a/php-webimpress-http-middleware-compatibility.spec +++ b/php-webimpress-http-middleware-compatibility.spec @@ -1,13 +1,14 @@ # remirepo/fedora spec file for php-webimpress-http-middleware-compatibility # -# Copyright (c) 2020 Remi Collet +# Copyright (c) 2020-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests + # Github %global gh_commit 8ed1c2c7523dce0035b98bc4f3a73ca9cd1d3717 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -20,7 +21,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 0.1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compatibility library for Draft PSR-15 HTTP Middleware License: BSD @@ -29,13 +30,13 @@ Source0: %{name}-%{version}-%{?gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} BuildRequires: php(language) >= 5.4 BuildRequires: (php-composer(http-interop/http-middleware) > 0.1.1 with php-composer(http-interop/http-middleware) < 0.6) # For tests, from composer.json "require-dev": { # "phpunit/phpunit": "^5.7.23 || ^6.4.3" -BuildRequires: phpunit6 > 6.4.3 -%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 %endif # From composer.json, "require": { @@ -86,7 +87,7 @@ cp -pr autoload %{buildroot}%{_datadir}/php/%{pk_vendor}/%{pk_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 0.1.4-6 +- switch to phpunit9 + * Wed Jan 27 2021 Fedora Release Engineering - 0.1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild