summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-02-20 10:15:24 +0100
committerRemi Collet <fedora@famillecollet.com>2014-02-20 10:15:24 +0100
commit44addaec069ead89db9b5177cdeb88f9e9bccebd (patch)
tree480a0b793ccfc43eddae87b3190d6ff6704a696d
parenta6aa7590a800633f6a527429b18ad01c7d1f63d0 (diff)
php-sabredav-Sabre*: revert to 1.7.x (no namespace)
-rw-r--r--php-sabredav-Sabre_DAVACL.spec23
-rw-r--r--php-sabredav-Sabre_DAVACL.xml7
2 files changed, 19 insertions, 11 deletions
diff --git a/php-sabredav-Sabre_DAVACL.spec b/php-sabredav-Sabre_DAVACL.spec
index 8e7a384..4171695 100644
--- a/php-sabredav-Sabre_DAVACL.spec
+++ b/php-sabredav-Sabre_DAVACL.spec
@@ -1,11 +1,12 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Sabre_DAVACL
%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_DAVACL
-Version: 1.8.7
+Epoch: 1
+Version: 1.7.9
Release: 1%{?dist}
Summary: RFC3744 implementation for SabreDAV
@@ -29,8 +30,8 @@ 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) >= 1.0.2
+Requires: php-pear(%{channelname}/Sabre_DAV) >= 1.7.10
Provides: php-pear(%{pear_name}) = %{version}
Provides: php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -58,11 +59,16 @@ fi
touch error.lst
for fic in $(find Sabre/DAVACL -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
@@ -102,6 +108,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_DAVACL.xml b/php-sabredav-Sabre_DAVACL.xml
index 1a9cf0c..724f67f 100644
--- a/php-sabredav-Sabre_DAVACL.xml
+++ b/php-sabredav-Sabre_DAVACL.xml
@@ -45,9 +45,8 @@ New release. Read the ChangeLog and announcement for more details
<file name="Sabre/DAVACL/Principal.php" role="php" />
<file name="Sabre/DAVACL/PrincipalCollection.php" role="php" />
<file name="Sabre/DAVACL/Version.php" role="php" />
- <file name="Sabre/DAVACL/PrincipalBackend/BackendInterface.php" role="php" />
- <file name="Sabre/DAVACL/PrincipalBackend/AbstractBackend.php" role="php" />
- <file name="Sabre/DAVACL/IPrincipalCollection.php" role="php" />
+ <file name="Sabre/DAVACL/includes.php" role="php" />
+ <file name="Sabre/DAVACL/IPrincipalBackend.php" role="php" />
<file name="examples/sql/mysql.principals.sql" role="doc" />
<file name="examples/sql/pgsql.principals.sql" role="doc" />
<file name="examples/sql/sqlite.principals.sql" role="doc" />
@@ -71,7 +70,7 @@ New release. Read the ChangeLog and announcement for more details
<package>
<name>Sabre_DAV</name>
<channel>pear.sabredav.org</channel>
- <min>1.6.0</min>
+ <min>1.7.0</min>
</package>
</required>
</dependencies>