- update to 4.0.2

- drop patch merged upstream

2 files changed, 7 insertions, 28 deletions

diff --git a/1187.patch b/1187.patch
deleted file mode 100644
index c61fc7f..0000000
--- a/1187.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f3c91ec654abe9774570ca0602a0e4916e3bf5b5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 20 Aug 2019 11:44:24 +0200
-Subject: [PATCH] fix Trying to access array offset on value of type null in
- 7.4
-
----
- lib/DAV/Xml/Property/Href.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DAV/Xml/Property/Href.php b/lib/DAV/Xml/Property/Href.php
-index 2d55e0ace5..d60bd15887 100644
---- a/lib/DAV/Xml/Property/Href.php
-+++ b/lib/DAV/Xml/Property/Href.php
-@@ -59,7 +59,7 @@ public function __construct($hrefs)
-      */
-     public function getHref()
-     {
--        return $this->hrefs[0];
-+        return $this->hrefs[0] ?? null;
-     }
- 
-     /**
diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec
index 432f975..6f7b039 100644
--- a/php-sabre-dav4.spec
+++ b/php-sabre-dav4.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 # Github
-%global gh_commit    e06e6202768babaab053e7ab260d1e43139a7753
+%global gh_commit    fd0234d46c045fc9b35ec06bd2e7b490240e6ade
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   dav
@@ -22,8 +22,8 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Summary:        WebDAV Framework for PHP
-Version:        4.0.1
-Release:        2%{?dist}
+Version:        4.0.2
+Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # sabre is BSD
@@ -33,7 +33,6 @@ 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}
@@ -169,7 +168,6 @@ 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
@@ -242,6 +240,10 @@ exit $ret
 
 
 %changelog
+* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 4.0.2-1
+- update to 4.0.2
+- drop patch merged upstream
+
 * Tue Aug 20 2019 Remi Collet <remi@remirepo.net> - 4.0.1-2
 - update to 4.0.1
 - add patch for 7.4 from