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

2 files changed, 20 insertions, 11 deletions

diff --git a/php-sabredav-Sabre_DAV.spec b/php-sabredav-Sabre_DAV.spec
index e3be00f..28c82f3 100644
--- a/php-sabredav-Sabre_DAV.spec
+++ b/php-sabredav-Sabre_DAV.spec
@@ -1,11 +1,12 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name   Sabre_DAV
 %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_DAV
-Version:        1.8.7
+Epoch:          1
+Version:        1.7.10
 Release:        1%{?dist}
 Summary:        Sabre_DAV is a WebDAV framework for PHP
 
@@ -31,8 +32,8 @@ Requires:       php-channel(%{channelname})
 Requires:       php-xml
 Requires:       php-mbstring
 Requires:       php-pdo
-Requires:       php-pear(%{channelname}/Sabre)      >= 1.0.1
-Requires:       php-pear(%{channelname}/Sabre_HTTP) >= 1.8.1
+Requires:       php-pear(%{channelname}/Sabre)      >= 1.0.2
+Requires:       php-pear(%{channelname}/Sabre_HTTP) >= 1.7.10
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -61,11 +62,16 @@ fi
 touch error.lst
 for fic in $(find Sabre/DAV -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
@@ -105,6 +111,9 @@ fi
 
 
 %changelog
+* Thu Feb 20 2014 Remi Collet <RPMS@FamilleCollet.com> 1:1.7.10-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_DAV.xml b/php-sabredav-Sabre_DAV.xml
index e2b0bb8..520c85b 100644
--- a/php-sabredav-Sabre_DAV.xml
+++ b/php-sabredav-Sabre_DAV.xml
@@ -118,11 +118,8 @@ New release. Read the ChangeLog and announcement for more details
    <file name="Sabre/DAV/PropertyInterface.php" role="php" />
    <file name="Sabre/DAV/PartialUpdate/Plugin.php" role="php" />
    <file name="Sabre/DAV/PartialUpdate/IFile.php" role="php" />
-   <file name="Sabre/DAV/Locks/Backend/BackendInterface.php" role="php" />
-   <file name="Sabre/DAV/Locks/Backend/AbstractBackend.php" role="php" />
    <file name="Sabre/DAV/Exception/ServiceUnavailable.php" role="php" />
    <file name="Sabre/DAV/Exception/ReportNotSupported.php" role="php" />
-   <file name="Sabre/DAV/Auth/Backend/BackendInterface.php" role="php" />
    <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" />
@@ -136,6 +133,9 @@ New release. Read the ChangeLog and announcement for more details
    <file name="examples/simplefsserver.php" role="doc" />
    <file name="ChangeLog" role="doc" />
    <file name="LICENSE" role="doc" />
+   <file name="Sabre/DAV/includes.php" role="php" />
+   <file name="Sabre/DAV/Locks/Backend/Abstract.php" role="php" />
+   <file name="Sabre/DAV/Auth/IBackend.php" role="php" />
   </dir>
  </contents>
  <dependencies>
@@ -154,7 +154,7 @@ 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>
   </required>
  </dependencies>