php-sabredav-Sabre_DAV: 1.8.5 (upstream PEAR not maintained)

2 files changed, 205 insertions, 18 deletions

diff --git a/php-sabredav-Sabre_DAV.spec b/php-sabredav-Sabre_DAV.spec
index 48b4806..0b2150e 100644
--- a/php-sabredav-Sabre_DAV.spec
+++ b/php-sabredav-Sabre_DAV.spec
@@ -1,17 +1,20 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name %(echo %{name} | sed -e 's/^php-sabredav-//' -e 's/-/_/g')
+%global pear_name   Sabre_DAV
 %global channelname pear.sabredav.org
+%global mainver     1.8.5
 
 Name:           php-sabredav-Sabre_DAV
-Version:        1.6.5
-Release:        4%{?dist}
+Version:        1.8.5
+Release:        1%{?dist}
 Summary:        Sabre_DAV is a WebDAV framework for PHP
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://code.google.com/p/sabredav
-Source0:        http://pear.sabredav.org/get/%{pear_name}-%{version}.tgz
-Patch1:         sabreDav_BrowserPluginFix.patch
+# https://github.com/fruux/sabre-dav/issues/336
+# Please update PEAR channel
+Source0:        http://sabredav.googlecode.com/files/SabreDAV-%{mainver}.zip
+Source1:        %{name}.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -27,8 +30,8 @@ Requires:       php-channel(%{channelname})
 Requires:       php-xml
 Requires:       php-mbstring
 Requires:       php-pdo
-Requires:       php-pear(%{channelname}/Sabre)
-Requires:       php-pear(%{channelname}/Sabre_HTTP)
+Requires:       php-pear(%{channelname}/Sabre)      >= 1.0.1
+Requires:       php-pear(%{channelname}/Sabre_HTTP) >= 1.8.1
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -39,11 +42,30 @@ is meant to cover the entire standard.
 
 
 %prep
-%setup -q -c
-%patch1 -p0
+%setup -q -n SabreDAV
 
-sed -e '/Plugin.php/s/md5sum.*name/name/' \
-  package.xml > %{pear_name}-%{version}/%{pear_name}.xml
+cp %{SOURCE1} .
+mv lib/Sabre Sabre
+
+# Check version
+extver=$(sed -n "/VERSION/{s/.* '//;s/'.*$//;p}" Sabre/DAV/Version.php)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}.
+   exit 1
+fi
+
+# Check files
+touch error.lst
+for fic in $(find Sabre/DAV -type f)
+do
+  grep $fic %{name}.xml || echo $fic >> error.lst
+done
+
+if [ -s error.lst ]; then
+  : Missing in %{name}.xml
+  cat error.lst
+  exit 1
+fi
 
 
 %build
@@ -51,20 +73,19 @@ sed -e '/Plugin.php/s/md5sum.*name/name/' \
 
 
 %install
-cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -76,11 +97,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Sabre/DAV
 
 
 %changelog
+* Tue May  7 2013 Remi Collet <RPMS@FamilleCollet.com> 1.8.5-1
+- update to 1.8.5
+  use our own package.xml as upstream doesn't use pear anymore
+
 * Wed May  1 2013 Remi Collet <RPMS@FamilleCollet.com> 1.6.5-4
 - sync with rawhide, backport for remi repo
 
diff --git a/php-sabredav-Sabre_DAV.xml b/php-sabredav-Sabre_DAV.xml
new file mode 100644
index 0000000..05610d7
--- /dev/null
+++ b/php-sabredav-Sabre_DAV.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0">
+ <name>Sabre_DAV</name>
+ <channel>pear.sabredav.org</channel>
+ <summary>Sabre_DAV is a WebDAV framework for PHP.</summary>
+ <description>SabreDAV allows you to easily integrate WebDAV access into your existing PHP application.
+
+Feature List:
+* Fully WebDAV (class 1, 2, 3) compliant
+* Supports Windows clients, OS/X, DavFS, Cadaver, and pretty much everything we&apos;ve come accross
+* Custom property support
+* RFC4918-compliant
+* Authentication support
+* Plugin system</description>
+ <lead>
+  <name>Evert Pot</name>
+  <user>Evert Pot</user>
+  <email>evert@rooftopsolutions.nl</email>
+  <active>true</active>
+ </lead>
+ <date>2012-10-04</date>
+ <time>12:02:37</time>
+ <version>
+  <release>1.8.5</release>
+  <api>1.8.5</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://code.google.com/p/sabredav/wiki/License">Modified BSD</license>
+ <notes>
+New release. Read the ChangeLog and announcement for more details
+ </notes>
+ <contents>
+  <dir name="/">
+   <file name="Sabre/DAV/Auth/Backend/AbstractBasic.php" role="php" />
+   <file name="Sabre/DAV/Auth/Backend/AbstractDigest.php" role="php" />
+   <file name="Sabre/DAV/Auth/Backend/Apache.php" role="php" />
+   <file name="Sabre/DAV/Auth/Backend/File.php" role="php" />
+   <file name="Sabre/DAV/Auth/Backend/PDO.php" role="php" />
+   <file name="Sabre/DAV/Auth/Plugin.php" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/addressbook.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/calendar.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/card.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/collection.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/file.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/parent.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/icons/principal.png" role="php" />
+   <file name="Sabre/DAV/Browser/assets/favicon.ico" role="php" />
+   <file name="Sabre/DAV/Browser/GuessContentType.php" role="php" />
+   <file name="Sabre/DAV/Browser/MapGetToPropFind.php" role="php" />
+   <file name="Sabre/DAV/Browser/Plugin.php" role="php" />
+   <file name="Sabre/DAV/Exception/BadRequest.php" role="php" />
+   <file name="Sabre/DAV/Exception/Conflict.php" role="php" />
+   <file name="Sabre/DAV/Exception/ConflictingLock.php" role="php" />
+   <file name="Sabre/DAV/Exception/FileNotFound.php" role="php" />
+   <file name="Sabre/DAV/Exception/Forbidden.php" role="php" />
+   <file name="Sabre/DAV/Exception/InsufficientStorage.php" role="php" />
+   <file name="Sabre/DAV/Exception/InvalidResourceType.php" role="php" />
+   <file name="Sabre/DAV/Exception/LockTokenMatchesRequestUri.php" role="php" />
+   <file name="Sabre/DAV/Exception/Locked.php" role="php" />
+   <file name="Sabre/DAV/Exception/MethodNotAllowed.php" role="php" />
+   <file name="Sabre/DAV/Exception/NotAuthenticated.php" role="php" />
+   <file name="Sabre/DAV/Exception/NotFound.php" role="php" />
+   <file name="Sabre/DAV/Exception/NotImplemented.php" role="php" />
+   <file name="Sabre/DAV/Exception/PaymentRequired.php" role="php" />
+   <file name="Sabre/DAV/Exception/PreconditionFailed.php" role="php" />
+   <file name="Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php" role="php" />
+   <file name="Sabre/DAV/Exception/UnsupportedMediaType.php" role="php" />
+   <file name="Sabre/DAV/FS/Directory.php" role="php" />
+   <file name="Sabre/DAV/FS/File.php" role="php" />
+   <file name="Sabre/DAV/FS/Node.php" role="php" />
+   <file name="Sabre/DAV/FSExt/Directory.php" role="php" />
+   <file name="Sabre/DAV/FSExt/File.php" role="php" />
+   <file name="Sabre/DAV/FSExt/Node.php" role="php" />
+   <file name="Sabre/DAV/Locks/Backend/FS.php" role="php" />
+   <file name="Sabre/DAV/Locks/Backend/File.php" role="php" />
+   <file name="Sabre/DAV/Locks/Backend/PDO.php" role="php" />
+   <file name="Sabre/DAV/Locks/LockInfo.php" role="php" />
+   <file name="Sabre/DAV/Locks/Plugin.php" role="php" />
+   <file name="Sabre/DAV/Mount/Plugin.php" role="php" />
+   <file name="Sabre/DAV/Property/GetLastModified.php" role="php" />
+   <file name="Sabre/DAV/Property/Href.php" role="php" />
+   <file name="Sabre/DAV/Property/HrefList.php" role="php" />
+   <file name="Sabre/DAV/Property/IHref.php" role="php" />
+   <file name="Sabre/DAV/Property/LockDiscovery.php" role="php" />
+   <file name="Sabre/DAV/Property/ResourceType.php" role="php" />
+   <file name="Sabre/DAV/Property/Response.php" role="php" />
+   <file name="Sabre/DAV/Property/ResponseList.php" role="php" />
+   <file name="Sabre/DAV/Property/SupportedLock.php" role="php" />
+   <file name="Sabre/DAV/Property/SupportedReportSet.php" role="php" />
+   <file name="Sabre/DAV/Tree/Filesystem.php" role="php" />
+   <file name="Sabre/DAV/Client.php" role="php" />
+   <file name="Sabre/DAV/Collection.php" role="php" />
+   <file name="Sabre/DAV/Exception.php" role="php" />
+   <file name="Sabre/DAV/File.php" role="php" />
+   <file name="Sabre/DAV/ICollection.php" role="php" />
+   <file name="Sabre/DAV/IExtendedCollection.php" role="php" />
+   <file name="Sabre/DAV/IFile.php" role="php" />
+   <file name="Sabre/DAV/INode.php" role="php" />
+   <file name="Sabre/DAV/IProperties.php" role="php" />
+   <file name="Sabre/DAV/IQuota.php" role="php" />
+   <file name="Sabre/DAV/Node.php" role="php" />
+   <file name="Sabre/DAV/ObjectTree.php" role="php" />
+   <file name="Sabre/DAV/Property.php" role="php" />
+   <file name="Sabre/DAV/Server.php" role="php" />
+   <file name="Sabre/DAV/ServerPlugin.php" role="php" />
+   <file name="Sabre/DAV/SimpleCollection.php" role="php" />
+   <file name="Sabre/DAV/SimpleFile.php" role="php" />
+   <file name="Sabre/DAV/StringUtil.php" role="php" />
+   <file name="Sabre/DAV/TemporaryFileFilterPlugin.php" role="php" />
+   <file name="Sabre/DAV/Tree.php" role="php" />
+   <file name="Sabre/DAV/URLUtil.php" role="php" />
+   <file name="Sabre/DAV/UUIDUtil.php" role="php" />
+   <file name="Sabre/DAV/Version.php" role="php" />
+   <file name="Sabre/DAV/XMLUtil.php" role="php" />
+   <file name="Sabre/DAV/PropertyInterface.php" role="doc" />
+   <file name="Sabre/DAV/PartialUpdate/Plugin.php" role="doc" />
+   <file name="Sabre/DAV/PartialUpdate/IFile.php" role="doc" />
+   <file name="Sabre/DAV/Locks/Backend/BackendInterface.php" role="doc" />
+   <file name="Sabre/DAV/Locks/Backend/AbstractBackend.php" role="doc" />
+   <file name="Sabre/DAV/Exception/ServiceUnavailable.php" role="doc" />
+   <file name="Sabre/DAV/Exception/ReportNotSupported.php" role="doc" />
+   <file name="Sabre/DAV/Auth/Backend/BackendInterface.php" role="doc" />
+   <file name="examples/sql/mysql.locks.sql" role="doc" />
+   <file name="examples/sql/mysql.users.sql" role="doc" />
+   <file name="examples/sql/pgsql.locks.sql" role="doc" />
+   <file name="examples/sql/pgsql.users.sql" role="doc" />
+   <file name="examples/sql/sqlite.locks.sql" role="doc" />
+   <file name="examples/sql/sqlite.users.sql" role="doc" />
+   <file name="examples/webserver/apache2_htaccess.conf" role="doc" />
+   <file name="examples/webserver/apache2_vhost.conf" role="doc" />
+   <file name="examples/webserver/apache2_vhost_cgi.conf" role="doc" />
+   <file name="examples/fileserver.php" role="doc" />
+   <file name="examples/simplefsserver.php" role="doc" />
+   <file name="ChangeLog" role="doc" />
+   <file name="LICENSE" role="doc" />
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3.1</min>
+   </php>
+   <pearinstaller>
+    <min>1.9</min>
+   </pearinstaller>
+   <package>
+    <name>Sabre</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.0.0</min>
+   </package>
+   <package>
+    <name>Sabre_HTTP</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.6.0</min>
+   </package>
+  </required>
+ </dependencies>
+ <phprelease />
+</package>