update to 4.1.5

use range dependencies on F27+

1 files changed, 17 insertions, 5 deletions

diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec
index 20fdab3..1db58de 100644
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@@ -1,18 +1,18 @@
 # remirepo/fedora spec file for php-sabre-vobject4
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    6484b9d660822c5e221c76122ce8ea658ecc9c5b
+%global gh_commit    0928660e92d46d2d24336a6db320636aa3a75414
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   vobject
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
-%if 0%{?fedora} > 25
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global with_cmd 1
 %else
 %global with_cmd 0
@@ -20,7 +20,7 @@
 
 Name:           php-sabre-vobject4
 Summary:        Library to parse and manipulate iCalendar and vCard objects
-Version:        4.1.4
+Version:        4.1.5
 Release:        1%{?dist}
 
 URL:            http://sabre.io/vobject/
@@ -36,8 +36,12 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.5
 BuildRequires:  php-mbstring
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  (php-composer(sabre/xml)    >= 1.5  with php-composer(sabre/xml)     < 3)
+%else
 BuildRequires:  php-composer(sabre/xml)     <  3
 BuildRequires:  php-composer(sabre/xml)     >= 1.5
+%endif
 BuildRequires:  php-date
 BuildRequires:  php-json
 BuildRequires:  php-pcre
@@ -58,8 +62,12 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "sabre/xml"    : ">=1.5 <3.0"
 Requires:       php(language) >= 5.5
 Requires:       php-mbstring
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:       (php-composer(sabre/xml)    >= 1.5  with php-composer(sabre/xml)     < 3)
+%else
 Requires:       php-composer(sabre/xml)     >= 1.5
 Requires:       php-composer(sabre/xml)     <  3
+%endif
 # From phpcompatinfo report for version 4.1.2
 %if %{with_cmd}
 Requires:       php-cli
@@ -120,7 +128,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
 
 : 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 --verbose || ret=1
   fi
@@ -143,6 +151,10 @@ exit $ret
 %endif
 
 %changelog
+* Fri Mar  9 2018 Remi Collet <remi@remirepo.net> - 4.1.5-1
+- update to 4.1.5
+- use range dependencies on F27+
+
 * Sat Dec 23 2017 Remi Collet <remi@remirepo.net> - 4.1.4-1
 - Update to 4.1.4