summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--php-fig-http-message-util.spec26
2 files changed, 23 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index 37ff9cc..11758fe 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,10 @@
}
],
"require": {
- "php": "^5.3 || ^7.0",
- "psr/http-message": "^1.0"
+ "php": "^5.3 || ^7.0"
+ },
+ "suggest": {
+ "psr/http-message": "The package containing the PSR-7 interfaces"
},
"autoload": {
"psr-4": {
diff --git a/php-fig-http-message-util.spec b/php-fig-http-message-util.spec
index 1c23874..41c8ae6 100644
--- a/php-fig-http-message-util.spec
+++ b/php-fig-http-message-util.spec
@@ -1,13 +1,13 @@
# remirepo/fedora spec file for php-fig-http-message-util
#
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 35b19404371b31b3a43823c755398c48c9966db4
+%global gh_commit 3242caa9da7221a304b8f84eb9eaddae0a7cf422
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner php-fig
%global gh_project http-message-util
@@ -15,7 +15,7 @@
%global pk_project %{gh_project}
Name: php-%{pk_owner}-%{pk_project}
-Version: 1.1.3
+Version: 1.1.4
Release: 1%{?dist}
Summary: PSR Http Message Util
@@ -25,15 +25,22 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
BuildArch: noarch
BuildRequires: php-cli
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2)
+%else
+BuildRequires: php-composer(psr/http-message) < 2
BuildRequires: php-composer(psr/http-message) >= 1.0
+%endif
BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": "^5.3 || ^7.0",
-# "psr/http-message": "^1.0"
Requires: php(language) > 5.3
-Requires: php-composer(psr/http-message) >= 1.0
-Requires: php-composer(psr/http-message) < 2
+# From composer.json, "suggest": {
+# "psr/http-message": "^1.0"
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Recommends: php-composer(psr/http-message)
+%endif
# From phpcompatinfo: none
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -62,7 +69,7 @@ cat << 'AUTOLOAD' | tee src/autoload.php
require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Fig\\Http\\Message\\', __DIR__);
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::optional(array(
'%{_datadir}/php/Psr/Http/Message/autoload.php',
));
AUTOLOAD
@@ -93,6 +100,11 @@ exit ($ok ? 0 : 1);
%changelog
+* Thu Mar 19 2020 Remi Collet <remi@remirepo.net> - 1.1.4-1
+- update to 1.1.4
+- psr/http-message is optional
+- use range dependencies
+
* Mon Nov 26 2018 Remi Collet <remi@remirepo.net> - 1.1.3-1
- update to 1.1.3