summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-sabre-http.spec41
1 files changed, 26 insertions, 15 deletions
diff --git a/php-sabre-http.spec b/php-sabre-http.spec
index 84d11ad..febf1ba 100644
--- a/php-sabre-http.spec
+++ b/php-sabre-http.spec
@@ -6,22 +6,22 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 0295f9a3ee39be97e0898592fc19e42421e0cd93
+%global gh_commit acccec4ba863959b2d10c1fa0fb902736c5c8956
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner fruux
-%global gh_project sabre-http
+%global gh_owner sabre-io
+%global gh_project http
#global prever alpha6
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
-Name: php-%{gh_project}
+Name: php-sabre-%{gh_project}
Summary: Library for dealing with http requests and responses
-Version: 4.2.3
+Version: 4.2.4
Release: 1%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
License: BSD
Group: Development/Libraries
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
Source1: %{name}-autoload.php
BuildArch: noarch
@@ -30,8 +30,13 @@ BuildRequires: php(language) > 5.4
BuildRequires: php-mbstring
BuildRequires: php-ctype
BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(sabre/event) >= 1.0.0
-BuildRequires: php-composer(sabre/uri) >= 1.0
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(sabre/event) >= 2.0.2 with php-composer(sabre/event) < 4)
+BuildRequires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 2)
+%else
+BuildRequires: php-sabre-event >= 2.0.2
+BuildRequires: php-sabre-uri
+%endif
BuildRequires: php-curl
BuildRequires: php-date
BuildRequires: php-hash
@@ -40,7 +45,6 @@ BuildRequires: php-spl
BuildRequires: php-xml
# Autoloader
BuildRequires: php-composer(fedora/autoloader)
-BuildRequires: php-composer(sabre/event) >= 2.0.2
%endif
# From composer.json, "require" : {
@@ -48,14 +52,18 @@ BuildRequires: php-composer(sabre/event) >= 2.0.2
# "ext-mbstring" : "*",
# "ext-ctype" : "*",
# "sabre/event" : ">=1.0.0,<4.0.0",
+# => use 2.0.2 for autoloader
# "sabre/uri" : "~1.0"
Requires: php(language) > 5.4
Requires: php-mbstring
Requires: php-ctype
-Requires: php-composer(sabre/event) >= 1.0.0
-Requires: php-composer(sabre/event) < 4
-Requires: php-composer(sabre/uri) >= 1.0
-Requires: php-composer(sabre/uri) < 2
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(sabre/event) >= 2.0.2 with php-composer(sabre/event) < 4)
+Requires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 2)
+%else
+Requires: php-sabre-event >= 2.0.2
+Requires: php-sabre-uri
+%endif
# From composer.json, "suggest" : {
# "ext-curl" : " to make http requests with the Client class"
Requires: php-curl
@@ -67,7 +75,6 @@ Requires: php-spl
Requires: php-xml
# Autoloader
Requires: php-composer(fedora/autoloader)
-Requires: php-composer(sabre/event) >= 2.0.2
# Was split from php-sabre-dav in version 1.9
Conflicts: php-sabre-dav < 1.9
@@ -123,7 +130,7 @@ cd tests
: Run upstream test suite against installed library
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php70 php71 php72; do
if which $cmd; then
$cmd %{_bindir}/phpunit --bootstrap=%{buildroot}%{_datadir}/php/Sabre/HTTP/autoload.php --verbose || ret=1
fi
@@ -143,6 +150,10 @@ exit $ret
%changelog
+* Tue Jun 5 2018 Remi Collet <remi@remirepo.net> - 4.2.4-1
+- update to 4.2.4
+- use range dependencies on F27+
+
* Mon Jun 12 2017 Remi Collet <remi@remirepo.net> - 4.2.3-1
- Update to 4.2.3