From e5acde46f31df1d67971946a73fc4b273b26006f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Jul 20 2015 14:39:28 +0000
Subject: v2.1.5 + autoloader


---

diff --git a/.gitignore b/.gitignore
index 8d0786a..15d30e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sabre-dav-1.8.9.tar.gz
 /sabre-dav-1.8.10.tar.gz
 /sabre-dav-1.8.12.tar.gz
+/sabre-dav-2.1.5-cab5ab4.tar.gz
diff --git a/php-sabre-dav-autoload.patch b/php-sabre-dav-autoload.patch
new file mode 100644
index 0000000..76e947b
--- /dev/null
+++ b/php-sabre-dav-autoload.patch
@@ -0,0 +1,29 @@
+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 @@
+ <?php
+ 
+-set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
+-
+-$autoLoader = include __DIR__ . '/../vendor/autoload.php';
++require '@BUILDROOT@/usr/share/php/Sabre/DAV/autoload.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__);
+ 
+ 
+ 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_MYSQLPASS' => '',
diff --git a/php-sabre-dav-autoload.php b/php-sabre-dav-autoload.php
new file mode 100644
index 0000000..938d523
--- /dev/null
+++ b/php-sabre-dav-autoload.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Autoloader for sabre/dav and its dependencies
+ */
+
+$vendorDir = '/usr/share/php';
+
+// Use Symfony autoloader
+if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
+    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
+        require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
+    }
+
+    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
+    $fedoraClassLoader->register();
+}
+
+$thisdir = dirname(dirname(__DIR__));
+$fedoraClassLoader->addPrefixes(array(
+  'Sabre\\DAV\\'     => $thisdir,
+  'Sabre\\DAVACL\\'  => $thisdir,
+  'Sabre\\CalDAV\\'  => $thisdir,
+  'Sabre\\CardDAV\\' => $thisdir,
+));
+
+// dependencies
+require_once $vendorDir . '/Sabre/Event/autoload.php';
+require_once $vendorDir . '/Sabre/HTTP/autoload.php';
+require_once $vendorDir . '/Sabre/VObject/autoload.php';
diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec
index 12d7ef6..1315d9a 100644
--- a/php-sabre-dav.spec
+++ b/php-sabre-dav.spec
@@ -1,12 +1,12 @@
-# Spec file for php-sabre-dav
+# remirepo/fedora spec file for php-sabre-dav
 #
-# Copyright (c) 2013-2014 Remi Collet
+# Copyright (c) 2013-2015 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    78b0a55ae126666b49ec9ac88582d453b971967d
+%global gh_commit    cab5ab4e9caa00ba12268aa5b35925dc65bd7d63
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     fruux
 %global gh_project   sabre-dav
@@ -14,42 +14,79 @@
 
 Name:           php-%{gh_project}
 Summary:        WebDAV Framework for PHP
-Version:        1.8.12
-Release:        2%{?dist}
+Version:        2.1.5
+Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
 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
 
-# replace composer autoloader with trivial PSR-0 one
-Patch0:         %{gh_project}-autoload.patch
+# replace composer autoloader
+Patch0:         %{name}-autoload.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.3.1
-BuildRequires:  %{_bindir}/phpunit
-BuildRequires:  php-sabre-vobject > 2.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-dom
+BuildRequires:  php-pcre
+BuildRequires:  php-spl
+BuildRequires:  php-simplexml
+BuildRequires:  php-mbstring
+BuildRequires:  php-ctype
+BuildRequires:  php-date
+BuildRequires:  php-iconv
+BuildRequires:  php-libxml
+BuildRequires:  php-curl
 BuildRequires:  php-pdo
+# Autoloader
+BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-pdo_sqlite
 %endif
 
-# From composer.json
+# From composer.json,    "require": {
+#        "php": ">=5.4.1",
+#        "sabre/vobject": ">=3.3.4 <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" : "*"
 Requires:       php(language) >= 5.3.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-dom
+Requires:       php-pcre
+Requires:       php-spl
+Requires:       php-simplexml
+Requires:       php-mbstring
 Requires:       php-ctype
 Requires:       php-date
-Requires:       php-dom
 Requires:       php-iconv
 Requires:       php-libxml
-Requires:       php-mbstring
-Requires:       php-pcre
-Requires:       php-simplexml
-Requires:       php-spl
-Requires:       php-sabre-vobject > 2.1
-# From phpcompatinfo report for version 1.8.7
+# From composer.json, "suggest" : {
+#        "ext-curl" : "*",
+#        "ext-pdo" : "*"
 Requires:       php-curl
 Requires:       php-pdo
-Requires:       php-xml
+# Autoloader
+Requires:       php-composer(symfony/class-loader)
 
 
 %description
@@ -76,19 +113,7 @@ Feature list:
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p0
-
-: Create trivial PSR0 autoloader for tests
-cat <<EOF | tee psr0.php
-<?php
-define('SABRE_HASSQLITE', 1);
-define('SABRE_HASMYSQL', 0);
-define("SABRE_TEMPDIR", __DIR__ . '/temp/');
-
-spl_autoload_register(function (\$class) {
-    \$file = str_replace('\\\\', '/', \$class).'.php';
-    @include \$file;
-});
-EOF
+cp %{SOURCE1} lib/DAV/autoload.php
 
 # drop executable as only provided as doc
 chmod -x bin/*
@@ -101,29 +126,23 @@ chmod -x bin/*
 %install
 # Install as a PSR-0 library
 mkdir -p %{buildroot}%{_datadir}/php
-cp -pr lib/Sabre %{buildroot}%{_datadir}/php/Sabre
+cp -pr lib %{buildroot}%{_datadir}/php/Sabre
 
 
 
 %check
-: Check that our autoloader is working
-php -d include_path=%{buildroot}%{_datadir}/php \
-    -r 'include "Sabre/autoload.php"; echo Sabre\DAV\Version::VERSION."\n";' \
-    | grep %{version}
-
 %if %{with_tests}
-: Run upstream test suite against installed library
-mkdir temp
+: Fix bootstrap
 cd tests
+sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
+
 # Skip tests with variable result because environment (GMT vs UTC)
-sed -e 's/function testCompTimeRange/function SKIP_testCompTimeRange/' \
-    -e 's/function testComplex/function SKIP_testComplex/' \
-    -i Sabre/CalDAV/CalendarQueryParserTest.php
-
-phpunit \
-  --bootstrap=../psr0.php \
-  --include-path=%{buildroot}%{_datadir}/php \
-  -d date.timezone=GMT
+#sed -e 's/function testCompTimeRange/function SKIP_testCompTimeRange/' \
+#    -e 's/function testComplex/function SKIP_testComplex/' \
+#    -i Sabre/CalDAV/CalendarQueryParserTest.php
+
+: Run upstream test suite against installed library
+phpunit --verbose
 %else
 : Skip upstream test suite
 %endif
@@ -131,12 +150,22 @@ phpunit \
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog composer.json LICENSE README.md
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc *md
+%doc composer.json
 %doc examples bin
-%{_datadir}/php/Sabre
+%{_datadir}/php/Sabre/DAV
+%{_datadir}/php/Sabre/DAVACL
+%{_datadir}/php/Sabre/CalDAV
+%{_datadir}/php/Sabre/CardDAV
 
 
 %changelog
+* Mon Jul 20 2015 Remi Collet <remi@fedoraproject.org> - 2.1.5-1
+- update to 2.1.5
+- add autoloader
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sabre-dav-autoload.patch b/sabre-dav-autoload.patch
deleted file mode 100644
index b5ddca6..0000000
--- a/sabre-dav-autoload.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up lib/Sabre/autoload.php.orig lib/Sabre/autoload.php
---- lib/Sabre/autoload.php.orig	2014-05-22 09:19:59.914874236 +0200
-+++ lib/Sabre/autoload.php	2014-05-22 09:21:26.300242963 +0200
-@@ -15,11 +15,9 @@
-  * @license http://sabre.io/license/ Modified BSD License
-  */
- 
--/**
-- * We are assuming that the composer autoloader is just 2 directories up.
-- *
-- * This is not the case when sabredav is installed as a dependency. But, in
-- * those cases it's not expected that people will look for this file anyway.
-- */
--
--require __DIR__ . '/../../vendor/autoload.php';
-+spl_autoload_register(function ($class) {
-+    if (strpos($class,'Sabre\\')===0) {
-+        $file = __DIR__ . str_replace('\\', '/', substr($class,5)).'.php';
-+        @include $file;
-+    }
-+});
diff --git a/sources b/sources
index 2a31285..b7d6ea9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34cf7e386d0d860371f38ca76501eb44  sabre-dav-1.8.12.tar.gz
+19f5dad91cb3535139b1b2e20da8c157  sabre-dav-2.1.5-cab5ab4.tar.gz