From 3efb0ec773f7bb22e61777701eaa240bcb302b6b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 14:18:25 +0200 Subject: fix FTBFS from Koschei, add path for recent PHPUnit from https://github.com/rmccue/Requests/pull/297 --- php-rmccue-requests.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/php-rmccue-requests.spec b/php-rmccue-requests.spec index 379f39d..06e24a2 100644 --- a/php-rmccue-requests.spec +++ b/php-rmccue-requests.spec @@ -9,7 +9,7 @@ # Name: php-rmccue-requests Version: 1.7.0 -Release: 2%{?dist} +Release: 4%{?dist} BuildArch: noarch License: ISC and BSD @@ -19,11 +19,12 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # This is only needed to run the test suite. Source1: https://github.com/RequestsPHP/test-server/archive/26334a7583c96ae1f966a5d88af9aafaf279f948/requests-tests-26334a75.tar.gz +Patch0: %{name}-pr297.patch + BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-fedora-autoloader-devel BuildRequires: php-zip BuildRequires: phpunit -#BuildRequires: procps-ng Requires: php(language) >= 5.5.0 Requires: php-composer(fedora/autoloader) @@ -57,7 +58,7 @@ We all have better things to do. That's why Requests was born. %prep -%autosetup -n Requests-%{version} +%autosetup -n Requests-%{version} -p1 tar xvf %{S:1} @@ -98,7 +99,7 @@ PHPPID=$! pushd tests # The request test server doesn't run over TLS so we skip HTTPS tests. The other tests fail if they # can't resolve domain names, so they are skipped as well. -REQUESTS_TEST_HOST="127.0.0.1:$port" phpunit --no-coverage --bootstrap bootstrap.php \ +REQUESTS_TEST_HOST="127.0.0.1:$port" php %{_bindir}/phpunit --no-coverage --bootstrap bootstrap.php \ --filter \ ^\(\(?!\(testHTTPS\|testAlternateNameSupport\|testSNISupport\|testAlternatePort\)\).\)*$ || \ (kill $PHPPID && exit 1) @@ -119,6 +120,10 @@ kill $PHPPID %changelog +* Mon Pct 23 2017 Remi Collet - 1.7.0-4 +- fix FTBFS from Koschei, add path for recent PHPUnit + from https://github.com/rmccue/Requests/pull/297 + * Thu Mar 9 2017 Remi Collet - 1.7.0-2 - backport for #remirepo -- cgit