php-sabredav-Sabre_CardDAV: 1.7.9 (backport)HEADmaster

2 files changed, 15 insertions, 14 deletions

diff --git a/php-sabredav-Sabre_CardDAV.spec b/php-sabredav-Sabre_CardDAV.spec
index 81637f1..97d7fd6 100644
--- a/php-sabredav-Sabre_CardDAV.spec
+++ b/php-sabredav-Sabre_CardDAV.spec
@@ -1,21 +1,19 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name   Sabre_CardDAV
 %global channelname pear.sabredav.org
-%global mainver     1.7.10
-%global reldate     2014-02-09
+%global mainver     1.7.13
+%global reldate     2014-07-28
 
 Name:           php-sabredav-Sabre_CardDAV
 Epoch:          1
 Version:        1.7.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Provides CardDAV support to Sabre_DAV
 
 Group:          Development/Libraries
 License:        BSD
-URL:            http://code.google.com/p/sabredav
-# https://github.com/fruux/sabre-dav/issues/336
-# Please update PEAR channel
-Source0:        http://sabredav.googlecode.com/files/SabreDAV-%{mainver}.zip
+URL:            http://sabre.io
+Source0:        https://github.com/fruux/sabre-dav/releases/download/%{mainver}/sabredav-%{mainver}.zip
 Source1:        %{name}.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +29,7 @@ Requires:       php-xml
 Requires:       php-pear(PEAR)
 Requires:       php-channel(%{channelname})
 Requires:       php-pear(%{channelname}/Sabre)         >= 1.0.2
-Requires:       php-pear(%{channelname}/Sabre_DAV)     >= 1.7.10
+Requires:       php-pear(%{channelname}/Sabre_DAV)     >= 1.7.13
 Requires:       php-pear(%{channelname}/Sabre_DAVACL)  >= 1.7.9
 Requires:       php-pear(%{channelname}/Sabre_VObject) >= 2.1.3
 
@@ -110,6 +108,9 @@ fi
 
 
 %changelog
+* Tue Oct 28 2014 Adam Williamson <awilliam@redhat.com> - 1.7.9-1
+- new release 1.7.9 (from SabreDAV 1.7.13, EOL)
+
 * Thu Feb 20 2014 Remi Collet <RPMS@FamilleCollet.com> 1:1.7.9-1
 - revert to 1.7
 
diff --git a/php-sabredav-Sabre_CardDAV.xml b/php-sabredav-Sabre_CardDAV.xml
index 30527d8..ef9cd57 100644
--- a/php-sabredav-Sabre_CardDAV.xml
+++ b/php-sabredav-Sabre_CardDAV.xml
@@ -33,6 +33,7 @@ New release. Read the ChangeLog and announcement for more details
  <contents>
   <dir name="/">
    <file name="Sabre/CardDAV/Backend/PDO.php" role="php" />
+   <file name="Sabre/CardDAV/Backend/Abstract.php" role="php" />
    <file name="Sabre/CardDAV/Property/SupportedAddressData.php" role="php" />
    <file name="Sabre/CardDAV/AddressBook.php" role="php" />
    <file name="Sabre/CardDAV/AddressBookQueryParser.php" role="php" />
@@ -44,11 +45,10 @@ New release. Read the ChangeLog and announcement for more details
    <file name="Sabre/CardDAV/Plugin.php" role="php" />
    <file name="Sabre/CardDAV/UserAddressBooks.php" role="php" />
    <file name="Sabre/CardDAV/Version.php" role="php" />
+   <file name="Sabre/CardDAV/includes.php" role="php" />
    <file name="examples/sql/sqlite.addressbooks.sql" role="doc" />
    <file name="examples/addressbookserver.php" role="doc" />
    <file name="Sabre/CardDAV/VCFExportPlugin.php" role="php" />
-   <file name="Sabre/CardDAV/includes.php" role="php" />
-   <file name="Sabre/CardDAV/Backend/Abstract.php" role="php" />
    <file name="ChangeLog" role="doc" />
    <file name="LICENSE" role="doc" />
   </dir>
@@ -69,22 +69,22 @@ New release. Read the ChangeLog and announcement for more details
    <package>
     <name>Sabre_HTTP</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.7.0</min>
+    <min>1.6.0</min>
    </package>
    <package>
     <name>Sabre_DAV</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.7.0</min>
+    <min>1.6.0</min>
    </package>
    <package>
     <name>Sabre_DAVACL</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.7.0</min>
+    <min>1.6.0</min>
    </package>
    <package>
     <name>Sabre_VObject</name>
     <channel>pear.sabredav.org</channel>
-    <min>2.1.0</min>
+    <min>1.3.0</min>
    </package>
   </required>
  </dependencies>