php-sabredav-Sabre*: revert to 1.7.x (no namespace)

2 files changed, 23 insertions, 14 deletions

diff --git a/php-sabredav-Sabre_CardDAV.spec b/php-sabredav-Sabre_CardDAV.spec
index 19a677c..81637f1 100644
--- a/php-sabredav-Sabre_CardDAV.spec
+++ b/php-sabredav-Sabre_CardDAV.spec
@@ -1,11 +1,12 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name   Sabre_CardDAV
 %global channelname pear.sabredav.org
-%global mainver     1.8.7
-%global reldate     2013-10-02
+%global mainver     1.7.10
+%global reldate     2014-02-09
 
 Name:           php-sabredav-Sabre_CardDAV
-Version:        1.8.7
+Epoch:          1
+Version:        1.7.9
 Release:        1%{?dist}
 Summary:        Provides CardDAV support to Sabre_DAV
 
@@ -29,9 +30,9 @@ Requires:       php-pdo
 Requires:       php-xml
 Requires:       php-pear(PEAR)
 Requires:       php-channel(%{channelname})
-Requires:       php-pear(%{channelname}/Sabre)         >= 1.0.1
-Requires:       php-pear(%{channelname}/Sabre_DAV)     >= 1.8.7
-Requires:       php-pear(%{channelname}/Sabre_DAVACL)  >= 1.8.7
+Requires:       php-pear(%{channelname}/Sabre)         >= 1.0.2
+Requires:       php-pear(%{channelname}/Sabre_DAV)     >= 1.7.10
+Requires:       php-pear(%{channelname}/Sabre_DAVACL)  >= 1.7.9
 Requires:       php-pear(%{channelname}/Sabre_VObject) >= 2.1.3
 
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -60,11 +61,16 @@ fi
 touch error.lst
 for fic in $(find Sabre/CardDAV -type f)
 do
-  grep $fic %{name}.xml || echo $fic >> error.lst
+  grep $fic %{name}.xml || echo -$fic >> error.lst
+done
+
+for fic in $(grep '<file' %{name}.xml | sed -e 's/.*name="//' -e 's/".*//')
+do
+  [ -f $fic ] || echo +$fic >> error.lst
 done
 
 if [ -s error.lst ]; then
-  : Missing in %{name}.xml
+  : Error in %{name}.xml
   cat error.lst
   exit 1
 fi
@@ -104,6 +110,9 @@ fi
 
 
 %changelog
+* Thu Feb 20 2014 Remi Collet <RPMS@FamilleCollet.com> 1:1.7.9-1
+- revert to 1.7
+
 * Sat Oct  5 2013 Remi Collet <RPMS@FamilleCollet.com> 1.8.7-1
 - update to 1.8.7
 
diff --git a/php-sabredav-Sabre_CardDAV.xml b/php-sabredav-Sabre_CardDAV.xml
index ca389a6..30527d8 100644
--- a/php-sabredav-Sabre_CardDAV.xml
+++ b/php-sabredav-Sabre_CardDAV.xml
@@ -47,8 +47,8 @@ New release. Read the ChangeLog and announcement for more details
    <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/Backend/BackendInterface.php" role="php" />
-   <file name="Sabre/CardDAV/Backend/AbstractBackend.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.6.0</min>
+    <min>1.7.0</min>
    </package>
    <package>
     <name>Sabre_DAV</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.6.0</min>
+    <min>1.7.0</min>
    </package>
    <package>
     <name>Sabre_DAVACL</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.6.0</min>
+    <min>1.7.0</min>
    </package>
    <package>
     <name>Sabre_VObject</name>
     <channel>pear.sabredav.org</channel>
-    <min>1.3.0</min>
+    <min>2.1.0</min>
    </package>
   </required>
  </dependencies>