diff --git a/.gitignore b/.gitignore index eba847d..157d704 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /sabre-dav-2.1.5-cab5ab4.tar.gz /sabre-dav-2.1.6-cab5ab4.tar.gz /sabre-dav-2.1.10-9f8c193.tar.gz +/sabre-dav-3.0.9-b425939.tar.gz 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 68234f9..4b15add 100644 --- a/php-sabre-dav.spec +++ b/php-sabre-dav.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 9f8c1939a3f66eb7170489fc48579ffd1461af62 +%global gh_commit b42593965211de1ce99f73bd3aede99c41258e08 %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.10 +Version: 3.0.9 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -31,8 +31,10 @@ BuildArch: noarch 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 @@ -52,8 +54,10 @@ BuildRequires: php-pdo_sqlite # From composer.json, "require": { # "php": ">=5.4.1", # "sabre/vobject": "^3.3.4", -# "sabre/event" : "^2.0.0", -# "sabre/http" : "^3.0.0", +# "sabre/event" : "~2.0", +# "sabre/xml" : "~1.0", +# "sabre/http" : "~4.0", +# "sabre/uri" : "~1.0", # "ext-dom": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -66,10 +70,14 @@ BuildRequires: php-pdo_sqlite 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 @@ -145,7 +153,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %{_bindir}/phpunit --verbose if which php70; then - php70 %{_bindir}/phpunit --verbose || : ignore test results + php70 %{_bindir}/phpunit --verbose fi %else : Skip upstream test suite @@ -165,12 +173,20 @@ fi %changelog -* Tue Mar 22 2016 Remi Collet - 2.1.10-1 -- update to 2.1.10 +* Thu Apr 7 2016 Remi Collet - 3.0.9-1 +- update to 3.0.9 -* Mon Mar 21 2016 Remi Collet - 2.1.6-2 +* Wed Mar 23 2016 Remi Collet - 3.0.8-1 +- update to 3.0.8 + +* Mon Mar 21 2016 Remi Collet - 3.0.7-2 - provide missing php-composer(sabre/dav) -- fix minimal PHP version required + +* 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 diff --git a/sources b/sources index 27f7df2..cb2c571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -981f8f1c85620cf393e4682ca584b38d sabre-dav-2.1.10-9f8c193.tar.gz +afd699ab4bd7c8aaf50520008b62f4e1 sabre-dav-3.0.9-b425939.tar.gz