summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-10-21 14:27:53 +0200
committerRemi Collet <remi@php.net>2021-10-21 14:27:53 +0200
commit9eb755ee8bccdc013bf64d1e6314666d32ccdcef (patch)
tree672148ce6cb461c47400f53149916c4d1a0e6caa
parent18dca3155181947cac08891cceb83f16f0669ccd (diff)
update to 1.8.3
-rw-r--r--composer.json26
-rw-r--r--php-guzzlehttp-psr7.spec19
2 files changed, 31 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 58dcb07..bfa7cfd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,37 @@
{
"name": "guzzlehttp/psr7",
- "type": "library",
"description": "PSR-7 message implementation that also provides common utility methods",
"keywords": ["request", "response", "message", "stream", "http", "uri", "url", "psr-7"],
"license": "MIT",
"authors": [
{
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
"name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
}
],
@@ -45,5 +65,9 @@
"branch-alias": {
"dev-master": "1.7-dev"
}
+ },
+ "config": {
+ "preferred-install": "dist",
+ "sort-packages": true
}
}
diff --git a/php-guzzlehttp-psr7.spec b/php-guzzlehttp-psr7.spec
index 72873ea..a1709cf 100644
--- a/php-guzzlehttp-psr7.spec
+++ b/php-guzzlehttp-psr7.spec
@@ -12,8 +12,8 @@
%global github_owner guzzle
%global github_name psr7
-%global github_version 1.8.2
-%global github_commit dc960a912984efb74d0a90222870c72c87f10c91
+%global github_version 1.8.3
+%global github_commit 1afdd860a2566ed3c2b0b4a3de6e23434a79ec85
%global composer_vendor guzzlehttp
%global composer_project psr7
@@ -38,18 +38,8 @@
%endif
# PHPUnit
-%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%global phpunit_require phpunit9
%global phpunit_exec phpunit9
-%else
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-%global phpunit_require phpunit8
-%global phpunit_exec phpunit8
-%else
-%global phpunit_require php-composer(phpunit/phpunit)
-%global phpunit_exec phpunit
-%endif
-%endif
%{!?phpdir: %global phpdir %{_datadir}/php}
@@ -175,7 +165,7 @@ BOOTSTRAP
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which %{phpunit_exec})
-for PHP_EXEC in "" %{?rhel:php55 php70 php71 php72} php73 php74 php80; do
+for PHP_EXEC in "" php73 php74 php80 php81; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
@@ -197,6 +187,9 @@ exit $RETURN_CODE
%changelog
+* Thu Oct 21 2021 Remi Collet <remi@remirepo.net> - 1.8.3-1
+- update to 1.8.3
+
* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 1.8.2-1
- update to 1.8.2