From 5e66aa90b6e662d79b23bce0358bf629ff1a0760 Mon Sep 17 00:00:00 2001
From: James Hogarth <james.hogarth@gmail.com>
Date: Feb 24 2016 16:41:13 +0000
Subject: Fix GetEventsByTimerange test


---

diff --git a/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch b/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch
new file mode 100644
index 0000000..555f2a4
--- /dev/null
+++ b/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+index 45531f2..2e9637d 100644
+--- a/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
++++ b/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+@@ -32,7 +32,7 @@ VERSION:2.0
+ BEGIN:VEVENT
+ CREATED:20120313T142342Z
+ UID:171EBEFC-C951-499D-B234-7BA7D677B45D
+-DTEND;TZID=Europe/Berlin:20120227T000000
++DTEND;TZID=Europe/Berlin:20120227T010000
+ TRANSP:OPAQUE
+ SUMMARY:Monday 0h
+ DTSTART;TZID=Europe/Berlin:20120227T000000
diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec
index 2bd913f..8048036 100644
--- a/php-sabre-dav.spec
+++ b/php-sabre-dav.spec
@@ -14,7 +14,7 @@
 
 Name:           php-%{gh_project}
 Summary:        WebDAV Framework for PHP
-Version:        2.1.5
+Version:        2.1.6
 Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -26,6 +26,9 @@ Source1:        %{name}-autoload.php
 # replace composer autoloader
 Patch0:         %{name}-autoload.patch
 
+# Partial cherry pick of 4eff5d4  to fix the zero length event breaking the test
+Patch1:         %{name}-GetEventsByTimerangeTest-zerolength.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
@@ -45,7 +48,6 @@ BuildRequires:  php-iconv
 BuildRequires:  php-libxml
 BuildRequires:  php-curl
 BuildRequires:  php-pdo
-BuildRequires:  php-pdo_mysql
 # Autoloader
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  php-pdo_sqlite
@@ -114,6 +116,7 @@ Feature list:
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p0
+%patch1 -p1
 cp %{SOURCE1} lib/DAV/autoload.php
 
 # drop executable as only provided as doc
@@ -163,6 +166,9 @@ phpunit --verbose
 
 
 %changelog
+* Wed Feb 24 2016 James Hogarth <james.hogarth@gmail.com> - 2.1.6-1
+- update to 2.1.6
+
 * Wed Feb 24 2016 Remi Collet <remi@fedoraproject.org> - 2.1.5-1
 - update to 2.1.5