From 6215e9e24c068f896236ca47f7771519c2fa69eb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 1 Jul 2019 17:54:29 +0200 Subject: only sabre/uri v1 --- php-sabre-xml.spec | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/php-sabre-xml.spec b/php-sabre-xml.spec index 1bd190b..5d24cd5 100644 --- a/php-sabre-xml.spec +++ b/php-sabre-xml.spec @@ -15,7 +15,7 @@ Name: php-sabre-%{gh_project} Summary: XML library that you may not hate Version: 1.5.1 -Release: 1%{?dist} +Release: 3%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -28,7 +28,13 @@ BuildRequires: php(language) >= 5.5.5 BuildRequires: php-xmlwriter BuildRequires: php-xmlreader BuildRequires: php-dom -BuildRequires: php-composer(sabre/uri) >= 1.0 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 2) +# remirepo:3 +%else +BuildRequires: php-sabre-uri +%endif BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { @@ -50,8 +56,13 @@ Requires: php(language) >= 5.5.5 Requires: php-xmlwriter Requires: php-xmlreader Requires: php-dom -Requires: php-composer(sabre/uri) >= 1.0 -Requires: php-composer(sabre/uri) < 3 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(sabre/uri) >= 1.0 with php-composer(sabre/uri) < 2) +# remirepo:3 +%else +Requires: php-sabre-uri +%endif # From phpcompatinfo report for version 1.4.0 Requires: php-pcre Requires: php-spl @@ -97,7 +108,7 @@ cd tests : Run upstream test suite against installed library ret=0 -for cmd in php php56 php70 php71 php72 php73; do +for cmd in php php70 php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit || ret=1 fi @@ -109,6 +120,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *md @@ -117,6 +129,9 @@ exit $ret %changelog +* Mon Jul 1 2019 Remi Collet - 1.5.1-3 +- only sabre/uri v1 + * Wed Jan 9 2019 Remi Collet - 1.5.1-1 - update to 1.5.1 -- cgit