diff --git a/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch b/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch deleted file mode 100644 index 555f2a4..0000000 --- a/php-sabre-dav-GetEventsByTimerangeTest-zerolength.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-autoload.patch b/php-sabre-dav-autoload.patch index 76e947b..8097050 100644 --- a/php-sabre-dav-autoload.patch +++ b/php-sabre-dav-autoload.patch @@ -1,7 +1,7 @@ -diff -up tests/bootstrap.php.rpm tests/bootstrap.php ---- tests/bootstrap.php.rpm 2015-07-20 16:23:38.849592222 +0200 -+++ tests/bootstrap.php 2015-07-20 16:23:46.101628015 +0200 -@@ -1,21 +1,17 @@ +diff -up tests/bootstrap.php.orig tests/bootstrap.php +--- tests/bootstrap.php.orig 2016-03-11 17:23:07.419944832 +0100 ++++ tests/bootstrap.php 2016-03-11 17:25:57.205599320 +0100 +@@ -1,21 +1,20 @@ add('Sabre\\', __DIR__); --// VObject tests auto loadiong --$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject'); +$fedoraClassLoader->addPrefix('Sabre\\', __DIR__); - ++ + // VObject tests auto loading +-$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject'); +-$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); ++//$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject'); ++//$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); date_default_timezone_set('UTC'); diff --git a/php-sabre-dav-autoload.php b/php-sabre-dav-autoload.php index 938d523..93a3196 100644 --- a/php-sabre-dav-autoload.php +++ b/php-sabre-dav-autoload.php @@ -27,3 +27,5 @@ $fedoraClassLoader->addPrefixes(array( require_once $vendorDir . '/Sabre/Event/autoload.php'; require_once $vendorDir . '/Sabre/HTTP/autoload.php'; require_once $vendorDir . '/Sabre/VObject/autoload.php'; +require_once $vendorDir . '/Sabre/Xml/autoload.php'; +require_once $vendorDir . '/Sabre/Uri/autoload.php'; diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec index 8048036..2fbc413 100644 --- a/php-sabre-dav.spec +++ b/php-sabre-dav.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit cab5ab4e9caa00ba12268aa5b35925dc65bd7d63 +%global gh_commit 294b6e133f3b4cf644b9637a734b53f82d46d7f7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner fruux %global gh_project sabre-dav @@ -14,7 +14,7 @@ Name: php-%{gh_project} Summary: WebDAV Framework for PHP -Version: 2.1.6 +Version: 3.0.7 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -26,17 +26,16 @@ 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} -BuildRequires: php(language) >= 5.3.1 +BuildRequires: php(language) >= 5.4.1 BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(sabre/vobject) >= 3.3.4 -BuildRequires: php-composer(sabre/event) >= 2.0.0 -BuildRequires: php-composer(sabre/http) >= 3.0.0 +BuildRequires: php-composer(sabre/event) >= 2.0 +BuildRequires: php-composer(sabre/xml) >= 1.0 +BuildRequires: php-composer(sabre/http) >= 4.0 +BuildRequires: php-composer(sabre/uri) >= 1.0 BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-spl @@ -55,9 +54,11 @@ BuildRequires: php-pdo_sqlite # From composer.json, "require": { # "php": ">=5.4.1", -# "sabre/vobject": ">=3.3.4 <4", -# "sabre/event" : "~2.0.0", -# "sabre/http" : "~3.0.0", +# "sabre/vobject": "^3.3.4", +# "sabre/event" : "~2.0", +# "sabre/xml" : "~1.0", +# "sabre/http" : "~4.0", +# "sabre/uri" : "~1.0", # "ext-dom": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -67,13 +68,17 @@ BuildRequires: php-pdo_sqlite # "ext-date" : "*", # "ext-iconv" : "*", # "ext-libxml" : "*" -Requires: php(language) >= 5.3.1 +Requires: php(language) >= 5.4.1 Requires: php-composer(sabre/vobject) >= 3.3.4 Requires: php-composer(sabre/vobject) < 4 -Requires: php-composer(sabre/event) >= 2.0.0 -Requires: php-composer(sabre/event) < 2.1 -Requires: php-composer(sabre/http) >= 3.0.0 -Requires: php-composer(sabre/http) < 3.1 +Requires: php-composer(sabre/event) >= 2.0 +Requires: php-composer(sabre/event) < 3 +Requires: php-composer(sabre/xml) >= 1.0 +Requires: php-composer(sabre/xml) < 2 +Requires: php-composer(sabre/http) >= 4.0 +Requires: php-composer(sabre/http) < 5 +Requires: php-composer(sabre/uri) >= 1.0 +Requires: php-composer(sabre/uri) < 2 Requires: php-dom Requires: php-pcre Requires: php-spl @@ -116,7 +121,6 @@ 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 @@ -146,7 +150,11 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php # -i Sabre/CalDAV/CalendarQueryParserTest.php : Run upstream test suite against installed library -phpunit --verbose +%{_bindir}/phpunit --verbose + +if which php70; then + php70 %{_bindir}/phpunit --verbose +fi %else : Skip upstream test suite %endif @@ -166,6 +174,13 @@ phpunit --verbose %changelog +* Fri Mar 11 2016 Remi Collet - 3.0.7-1 +- update to 3.0.7 +- add dependency on sabre/xml +- add dependency on sabre/uri +- raise dependency on sabre/http >= 4 +- run test suite with both PHP 5 and 7 when available + * Wed Feb 24 2016 James Hogarth - 2.1.6-1 - update to 2.1.6