summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-psr-http-factory.spec27
2 files changed, 19 insertions, 12 deletions
diff --git a/composer.json b/composer.json
index af62b29..d1bbdde 100644
--- a/composer.json
+++ b/composer.json
@@ -15,12 +15,12 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"require": {
"php": ">=7.0.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"autoload": {
"psr-4": {
diff --git a/php-psr-http-factory.spec b/php-psr-http-factory.spec
index adbd7c4..4106e59 100644
--- a/php-psr-http-factory.spec
+++ b/php-psr-http-factory.spec
@@ -1,13 +1,13 @@
# remirepo/fedora spec file for php-psr-http-factory
#
-# Copyright (c) 2018-2019 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2018-2023 Remi Collet
+# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 12ac7fcd07e5b077433f5f2bee95b3a771bf61be
+%global gh_commit e616d01114759c4c489f93b099585439f795fe35
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner php-fig
%global gh_project http-factory
@@ -16,7 +16,7 @@
%global pk_project %{gh_project}
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1.0.1
+Version: 1.0.2
Release: 1%{?dist}
Summary: Common interfaces for PSR-7 HTTP message factories
@@ -29,7 +29,7 @@ BuildArch: noarch
BuildRequires: php(language) >= 7
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2)
+BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 3)
# remirepo:3
%else
BuildRequires: php-psr-http-message
@@ -39,11 +39,11 @@ BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require": {
# "php": ">=7.0.0",
-# "psr/http-message": "^1.0"
+# "psr/http-message": "^1.0 || ^2.0"
Requires: php(language) >= 7
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2)
+Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 3)
# remirepo:3
%else
Requires: php-psr-http-message
@@ -77,9 +77,12 @@ Autoloader: %{_datadir}/php/Psr/Http/Message/%{pk_project}-autoload.php
%{_bindir}/phpab --template fedora --output src/%{pk_project}-autoload.php src
cat << 'EOF' | tee -a src/%{pk_project}-autoload.php
-\Fedora\Autoloader\Dependencies::required(array(
- '%{_datadir}/php/Psr/Http/Message/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+ [
+ '%{_datadir}/php/Psr/Http/Message2/autoload.php',
+ '%{_datadir}/php/Psr/Http/Message/autoload.php',
+ ],
+]);
EOF
@@ -106,6 +109,10 @@ exit (interface_exists("Psr\\Http\\Message\\RequestFactoryInterface") ? 0 : 1);
%changelog
+* Tue Apr 11 2023 Remi Collet <remi@remirepo.net> - 1.0.2-1
+- update to 1.0.2
+- allow psr/http-message 2.0
+
* Thu May 2 2019 Remi Collet <remi@remirepo.net> - 1.0.1-1
- update to 1.0.1