summaryrefslogtreecommitdiffstats
path: root/php-sabre-vobject4.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-01 18:44:10 +0200
committerRemi Collet <remi@remirepo.net>2019-07-01 18:44:10 +0200
commitad1f858f324aebf6dd0ced461e2a1046f445ab43 (patch)
tree5200dbf010312a979a5c58156079d3c3e7753b42 /php-sabre-vobject4.spec
parent9cb1dfe6e01462ca2d6b674a75f601f1714e06c5 (diff)
fix autoloader for sabre/xml version 2
Diffstat (limited to 'php-sabre-vobject4.spec')
-rw-r--r--php-sabre-vobject4.spec18
1 files changed, 12 insertions, 6 deletions
diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec
index 4ed5505..92cddd6 100644
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@@ -25,7 +25,7 @@
Name: php-sabre-vobject4
Summary: Library to parse and manipulate iCalendar and vCard objects
Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://sabre.io/vobject/
License: BSD
@@ -39,11 +39,12 @@ BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 5.5
BuildRequires: php-mbstring
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3)
+# remirepo:3
%else
-BuildRequires: php-composer(sabre/xml) < 3
-BuildRequires: php-composer(sabre/xml) >= 1.5
+BuildRequires: php-sabre/xml >= 1.5
%endif
BuildRequires: php-date
BuildRequires: php-json
@@ -63,11 +64,13 @@ BuildRequires: php-composer(fedora/autoloader)
# "sabre/xml" : ">=1.5 <3.0"
Requires: php(language) >= 5.5
Requires: php-mbstring
+#
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3)
+# remirepo:3
%else
-Requires: php-composer(sabre/xml) >= 1.5
-Requires: php-composer(sabre/xml) < 3
+Requires: php-sabre-xml >= 1.5
%endif
# From phpcompatinfo report for version 4.1.2
%if %{with_cmd}
@@ -129,7 +132,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
: Run upstream test suite against installed library
ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
@@ -152,6 +155,9 @@ exit $ret
%endif
%changelog
+* Mon Jul 1 2019 Remi Collet <remi@remirepo.net> - 4.2.0-2
+- fix autoloader for sabre/xml version 2
+
* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 4.2.0-1
- update to 4.2.0