From 423b265fb2323517afb993024a42afc7fceb1396 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Feb 2021 09:21:41 +0100
Subject: update to 1.4.0

---
 composer.json        |  2 +-
 php-nyholm-psr7.spec | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index a5b9dc0..0741e74 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.4-dev"
         }
     }
 }
diff --git a/php-nyholm-psr7.spec b/php-nyholm-psr7.spec
index 45da353..d9f0bb9 100644
--- a/php-nyholm-psr7.spec
+++ b/php-nyholm-psr7.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-nyholm-psr7
 #
-# Copyright (c) 2019 Remi Collet
+# Copyright (c) 2019-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -8,7 +8,7 @@
 #
 %global bootstrap    0
 # github
-%global gh_commit    a272953743c454ac4af9626634daaf5ab3ce1173
+%global gh_commit    23ae1f00fbc6a886cbe3062ca682391b9cc7c37b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     Nyholm
 %global gh_project   psr7
@@ -34,7 +34,7 @@
 %global http_factory_tests_short      %(c=%{http_factory_tests_commit}; echo ${c:0:7})
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        1.3.2
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        A fast PHP7 implementation of PSR-7
 
@@ -152,6 +152,10 @@ require_once '%{php_home}/Symfony4/Component/ErrorHandler/autoload.php';
 require_once dirname(__DIR__) . '/test-autoload.php';
 EOF
 
+: Fix path
+sed -e 's:./vendor/http-interop/http-factory-tests:http-factory-tests-%{http_factory_tests_commit}:' \
+    phpunit.xml.dist >phpunit.xml
+
 : Run upstream test suite
 : Ignore online tests
 # TODO testCanDetachStream may fail on local build (extension conflicts ?)
@@ -181,6 +185,12 @@ exit $ret
 
 
 %changelog
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- update to 1.4.0
+
+* Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 1.3.2-2
+- fix test path and FTBFS
+
 * Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 1.3.2-1
 - update to 1.3.2
 - switch to phpunit9
-- 
cgit