summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-dev.json66
-rw-r--r--composer.json59
-rw-r--r--php-sabre-dav-autoload-dev.patch17
-rw-r--r--php-sabre-dav-autoload-dev.php2
-rw-r--r--php-sabre-dav-dev.spec49
5 files changed, 169 insertions, 24 deletions
diff --git a/composer-dev.json b/composer-dev.json
new file mode 100644
index 0000000..9994605
--- /dev/null
+++ b/composer-dev.json
@@ -0,0 +1,66 @@
+{
+ "name": "sabre/dav",
+ "type": "library",
+ "description": "WebDAV Framework for PHP",
+ "keywords": ["Framework", "WebDAV", "CalDAV", "CardDAV", "iCalendar"],
+ "homepage": "http://sabre.io/",
+ "license" : "BSD-3-Clause",
+ "authors": [
+ {
+ "name": "Evert Pot",
+ "email": "me@evertpot.com",
+ "homepage" : "http://evertpot.com/",
+ "role" : "Developer"
+ }
+ ],
+ "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",
+ "ext-dom": "*",
+ "ext-pcre": "*",
+ "ext-spl": "*",
+ "ext-simplexml": "*",
+ "ext-mbstring" : "*",
+ "ext-ctype" : "*",
+ "ext-date" : "*",
+ "ext-iconv" : "*",
+ "lib-libxml" : ">=2.7.0"
+ },
+ "require-dev" : {
+ "phpunit/phpunit" : "~4.2",
+ "evert/phpdoc-md" : "~0.1.0",
+ "sabre/cs" : "~0.0.2"
+ },
+ "suggest" : {
+ "ext-curl" : "*",
+ "ext-pdo" : "*"
+ },
+ "autoload": {
+ "psr-4" : {
+ "Sabre\\DAV\\" : "lib/DAV/",
+ "Sabre\\DAVACL\\" : "lib/DAVACL/",
+ "Sabre\\CalDAV\\" : "lib/CalDAV/",
+ "Sabre\\CardDAV\\" : "lib/CardDAV/"
+ }
+ },
+ "support" : {
+ "forum" : "https://groups.google.com/group/sabredav-discuss",
+ "source" : "https://github.com/fruux/sabre-dav"
+ },
+ "bin" : [
+ "bin/sabredav",
+ "bin/naturalselection"
+ ],
+ "config" : {
+ "bin-dir" : "./bin"
+ },
+ "extra" : {
+ "branch-alias": {
+ "dev-master": "3.0.0-dev"
+ }
+ }
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..71166ca
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,59 @@
+{
+ "name": "sabre/dav",
+ "type": "library",
+ "description": "WebDAV Framework for PHP",
+ "keywords": ["Framework", "WebDAV", "CalDAV", "CardDAV", "iCalendar"],
+ "homepage": "http://sabre.io/",
+ "license" : "BSD-3-Clause",
+ "authors": [
+ {
+ "name": "Evert Pot",
+ "email": "me@evertpot.com",
+ "homepage" : "http://evertpot.com/",
+ "role" : "Developer"
+ }
+ ],
+ "require": {
+ "php": ">=5.4.1",
+ "sabre/vobject": "^3.3.4",
+ "sabre/event" : "^2.0.0",
+ "sabre/http" : "^3.0.0",
+ "ext-dom": "*",
+ "ext-pcre": "*",
+ "ext-spl": "*",
+ "ext-simplexml": "*",
+ "ext-mbstring" : "*",
+ "ext-ctype" : "*",
+ "ext-date" : "*",
+ "ext-iconv" : "*",
+ "ext-libxml" : "*"
+ },
+ "require-dev" : {
+ "phpunit/phpunit" : "~4.2",
+ "evert/phpdoc-md" : "~0.1.0",
+ "squizlabs/php_codesniffer": "~1.5.3"
+ },
+ "suggest" : {
+ "ext-curl" : "*",
+ "ext-pdo" : "*"
+ },
+ "autoload": {
+ "psr-4" : {
+ "Sabre\\DAV\\" : "lib/DAV/",
+ "Sabre\\DAVACL\\" : "lib/DAVACL/",
+ "Sabre\\CalDAV\\" : "lib/CalDAV/",
+ "Sabre\\CardDAV\\" : "lib/CardDAV/"
+ }
+ },
+ "support" : {
+ "forum" : "https://groups.google.com/group/sabredav-discuss",
+ "source" : "https://github.com/fruux/sabre-dav"
+ },
+ "bin" : [
+ "bin/sabredav",
+ "bin/naturalselection"
+ ],
+ "config" : {
+ "bin-dir" : "./bin"
+ }
+}
diff --git a/php-sabre-dav-autoload-dev.patch b/php-sabre-dav-autoload-dev.patch
index 76e947b..8097050 100644
--- a/php-sabre-dav-autoload-dev.patch
+++ b/php-sabre-dav-autoload-dev.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 @@
<?php
-set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
@@ -11,10 +11,13 @@ diff -up tests/bootstrap.php.rpm tests/bootstrap.php
// SabreDAV tests auto loading
-$autoLoader->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-dev.php b/php-sabre-dav-autoload-dev.php
index 938d523..93a3196 100644
--- a/php-sabre-dav-autoload-dev.php
+++ b/php-sabre-dav-autoload-dev.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-dev.spec b/php-sabre-dav-dev.spec
index a1fddfd..d57596f 100644
--- a/php-sabre-dav-dev.spec
+++ b/php-sabre-dav-dev.spec
@@ -6,25 +6,29 @@
#
# 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
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+%if 0%{?rhel} == 5
+%global with_tests 0%{?_with_tests:1}
+%else
+%global with_tests 0%{!?_without_tests:1}
+%endif
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}
License: BSD
Group: Development/Libraries
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
-Source1: %{name}-autoload.php
+Source1: %{name}-autoload-dev.php
# replace composer autoloader
-Patch0: %{name}-autoload.patch
+Patch0: %{name}-autoload-dev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -32,8 +36,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
@@ -53,8 +59,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": "*",
@@ -67,10 +75,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
@@ -131,14 +143,11 @@ mkdir -p %{buildroot}%{_datadir}/php
cp -pr lib %{buildroot}%{_datadir}/php/Sabre
-
%check
%if %{with_tests}
%if 0%{?rhel} == 5
sed -e 's/testMove/SKIP_testMove/' \
-i tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php
-sed -e 's/testCalendarQueryReportWindowsPhone/SKIP_testCalendarQueryReportWindowsPhone/' \
- -i tests/Sabre/CalDAV/PluginTest.php
%endif
: Fix bootstrap
@@ -149,7 +158,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
@@ -170,6 +179,12 @@ fi
%changelog
+* Thu Apr 7 2016 Remi Collet <remi@fedoraproject.org> - 3.0.9-1
+- update to 3.0.9
+- add dependency on sabre/xml
+- add dependency on sabre/uri
+- raise dependency on sabre/http >= 4
+
* Tue Mar 22 2016 Remi Collet <remi@fedoraproject.org> - 2.1.10-1
- update to 2.1.10
generated by cgit (git 2.34.1) at 2025-11-04 12:36:46 +0000