From 5101559e0b743b4e72b33763b70c494ef0d6f26f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: May 06 2017 10:02:07 +0000 Subject: update to 3.2.2 raise dependency on PHP version 5.5 raise dependency on sabre/vobject version 4.1 raise dependency on sabre/xml version 1.4 raise dependency on sabre/http version 4.2.1 raise dependency on sabre/uri version 1.0.1 add dependency on psr/log --- diff --git a/.gitignore b/.gitignore index 157d704..8f02c94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +clog /sabre-dav-1.8.7.tar.gz /sabre-dav-1.8.8.tar.gz /sabre-dav-1.8.9.tar.gz @@ -7,3 +8,4 @@ /sabre-dav-2.1.6-cab5ab4.tar.gz /sabre-dav-2.1.10-9f8c193.tar.gz /sabre-dav-3.0.9-b425939.tar.gz +/sabre-dav-3.2.2-e987775.tar.gz diff --git a/php-sabre-dav-autoload.patch b/php-sabre-dav-autoload.patch index a1af77d..4e7c252 100644 --- a/php-sabre-dav-autoload.patch +++ b/php-sabre-dav-autoload.patch @@ -1,32 +1,33 @@ -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 @@ +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./tests/bootstrap.php.rpm 2017-01-17 14:58:57.986380935 +0100 ++++ ./tests/bootstrap.php 2017-01-17 15:00:56.261957259 +0100 +@@ -1,22 +1,21 @@ add('Sabre\\', __DIR__); +\Fedora\Autoloader\Autoload::addPsr0('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'); +-$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'); $config = [ 'SABRE_TEMPDIR' => dirname(__FILE__) . '/temp/', -- 'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()), -- 'SABRE_HASMYSQL' => in_array('mysql',PDO::getAvailableDrivers()), -+ 'SABRE_HASSQLITE' => 1, -+ 'SABRE_HASMYSQL' => 0, - 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav', - 'SABRE_MYSQLUSER' => 'root', + 'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()), +- 'SABRE_HASMYSQL' => in_array('mysql', PDO::getAvailableDrivers()), +- 'SABRE_HASPGSQL' => in_array('pgsql', PDO::getAvailableDrivers()), ++ 'SABRE_HASMYSQL' => false, ++ 'SABRE_HASPGSQL' => false, + 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav_test', + 'SABRE_MYSQLUSER' => 'sabredav', 'SABRE_MYSQLPASS' => '', diff --git a/php-sabre-dav-autoload.php b/php-sabre-dav-autoload.php index 160dfab..edbbc4d 100644 --- a/php-sabre-dav-autoload.php +++ b/php-sabre-dav-autoload.php @@ -8,11 +8,12 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Sabre\\CalDAV\\', dirname(__DIR__) . '/CalDAV'); \Fedora\Autoloader\Autoload::addPsr4('Sabre\\CardDAV\\', dirname(__DIR__) . '/CardDAV'); -\Fedora\Autoloader\Dependencies::required(array( +\Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Sabre/Event/autoload.php', '/usr/share/php/Sabre/HTTP/autoload.php', - '/usr/share/php/Sabre/VObject/autoload.php', + '/usr/share/php/Sabre/VObject4/autoload.php', '/usr/share/php/Sabre/Xml/autoload.php', '/usr/share/php/Sabre/Uri/autoload.php', -)); + '/usr/share/php/Psr/Log/autoload.php', +]); diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec index b904689..5ae0ba9 100644 --- a/php-sabre-dav.spec +++ b/php-sabre-dav.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-sabre-dav # -# Copyright (c) 2013-2016 Remi Collet +# Copyright (c) 2013-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit b42593965211de1ce99f73bd3aede99c41258e08 +%global gh_commit e987775e619728f12205606c9cc3ee565ffb1516 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner fruux %global gh_project sabre-dav @@ -18,8 +18,8 @@ Name: php-%{gh_project} Summary: WebDAV Framework for PHP -Version: 3.0.9 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD @@ -29,18 +29,15 @@ Source1: %{name}-autoload.php # replace composer autoloader Patch0: %{name}-autoload.patch -# upstream patch for 7.1 -Patch1: %{name}-php71.patch BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 5.4.1 -BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(sabre/vobject) >= 3.3.4 +BuildRequires: php(language) >= 5.5 +BuildRequires: php-composer(sabre/vobject) >= 4.1.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-composer(sabre/xml) >= 1.4.0 +BuildRequires: php-composer(sabre/http) >= 4.2.1 +BuildRequires: php-composer(sabre/uri) >= 1.0.1 BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-spl @@ -50,20 +47,30 @@ BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-iconv BuildRequires: php-libxml +BuildRequires: php-composer(psr/log) >= 1.0.1 BuildRequires: php-curl BuildRequires: php-pdo +# From composer.json, "require-dev" : { +# "phpunit/phpunit" : "> 4.8, <6.0.0", +# "evert/phpdoc-md" : "~0.1.0", +# "squizlabs/php_codesniffer": "~1.5.3" +# "sabre/cs" : "^1.0.0", +# "monolog/monolog": "^1.18" +BuildRequires: php-composer(phpunit/phpunit) >= 4.8 +BuildRequires: php-composer(monolog/monolog) >= 1.18 + # Autoloader BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-pdo_sqlite %endif # From composer.json, "require": { -# "php": ">=5.4.1", -# "sabre/vobject": "^3.3.4", -# "sabre/event" : "~2.0", -# "sabre/xml" : "~1.0", -# "sabre/http" : "~4.0", -# "sabre/uri" : "~1.0", +# "php": ">=5.5.0", +# "sabre/vobject": "^4.1.0", +# "sabre/event" : ">=2.0.0, <4.0.0", +# "sabre/xml" : "^1.4.0", +# "sabre/http" : "^4.2.1", +# "sabre/uri" : "^1.0.1", # "ext-dom": "*", # "ext-pcre": "*", # "ext-spl": "*", @@ -72,17 +79,18 @@ BuildRequires: php-pdo_sqlite # "ext-ctype" : "*", # "ext-date" : "*", # "ext-iconv" : "*", -# "ext-libxml" : "*" +# "lib-libxml" : ">=2.7.0", +# "psr/log": "^1.0" Requires: php(language) >= 5.4.1 -Requires: php-composer(sabre/vobject) >= 3.3.4 -Requires: php-composer(sabre/vobject) < 4 +Requires: php-composer(sabre/vobject) >= 4.1.0 +Requires: php-composer(sabre/vobject) < 5 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) >= 1.4.0 Requires: php-composer(sabre/xml) < 2 -Requires: php-composer(sabre/http) >= 4.0 +Requires: php-composer(sabre/http) >= 4.2.1 Requires: php-composer(sabre/http) < 5 -Requires: php-composer(sabre/uri) >= 1.0 +Requires: php-composer(sabre/uri) >= 1.0.1 Requires: php-composer(sabre/uri) < 2 Requires: php-dom Requires: php-pcre @@ -93,6 +101,8 @@ Requires: php-ctype Requires: php-date Requires: php-iconv Requires: php-libxml +Requires: php-composer(psr/log) >= 1.0.1 +Requires: php-composer(psr/log) < 2 # From composer.json, "suggest" : { # "ext-curl" : "*", # "ext-pdo" : "*" @@ -129,8 +139,8 @@ Autoloader: %{_datadir}/php/Sabre/DAV/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -%patch1 -p1 +%patch0 -p1 -b .rpm + cp %{SOURCE1} lib/DAV/autoload.php # drop executable as only provided as doc @@ -178,6 +188,15 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %changelog +* Wed Feb 15 2017 Remi Collet - 3.2.2-1 +- update to 3.2.2 +- raise dependency on PHP version 5.5 +- raise dependency on sabre/vobject version 4.1 +- raise dependency on sabre/xml version 1.4 +- raise dependency on sabre/http version 4.2.1 +- raise dependency on sabre/uri version 1.0.1 +- add dependency on psr/log + * Sat Feb 11 2017 Fedora Release Engineering - 3.0.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index cb2c571..f35a00d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afd699ab4bd7c8aaf50520008b62f4e1 sabre-dav-3.0.9-b425939.tar.gz +SHA512 (sabre-dav-3.2.2-e987775.tar.gz) = 1baeb85908162d096d962d55661040b546b8533690c446e97cd98e50f0048153c99d14559a2b22e925d203f54dbf0b575c93c93bf48a98a6d1d6afcf4f678d47