From e141f93dafe7f79abf69128580dd333ad0e5d1e0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Aug 2019 14:48:39 +0200 Subject: add patch for 7.4 from https://github.com/sabre-io/dav/pull/1187 --- php-sabre-dav4.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'php-sabre-dav4.spec') diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index c3c4ce2..432f975 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -33,6 +33,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # replace composer autoloader Patch0: %{name}-autoload.patch +Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/dav/pull/1187.patch BuildArch: noarch %if %{with_tests} @@ -168,6 +169,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php mv lib/DAV/Browser/assets/openiconic/ICON-LICENSE . %patch0 -p1 -b .rpm +%patch1 -p1 : relocate for dir in CalDAV CardDAV DAV DAVACL; do @@ -211,11 +213,9 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php # TODO testDeliverInsignificantRequest fails locally, not in mock -# TODO 7.4 see https://github.com/sabre-io/dav/pull/1187 - : Run upstream test suite against installed library ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit6 \ --filter '^((?!(testDeliverInsignificantRequest)).)*$' \ @@ -242,6 +242,11 @@ exit $ret %changelog +* Tue Aug 20 2019 Remi Collet - 4.0.1-2 +- update to 4.0.1 +- add patch for 7.4 from + https://github.com/sabre-io/dav/pull/1187 + * Tue Aug 20 2019 Remi Collet - 4.0.1-1 - update to 4.0.1 -- cgit