From 316a2c74e366ccb3ccdd876d0a0b3d8da0058834 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Feb 2014 10:15:24 +0100 Subject: php-sabredav-Sabre*: revert to 1.7.x (no namespace) --- php-sabredav-Sabre_CalDAV.spec | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'php-sabredav-Sabre_CalDAV.spec') diff --git a/php-sabredav-Sabre_CalDAV.spec b/php-sabredav-Sabre_CalDAV.spec index dd99efc..114a86a 100644 --- a/php-sabredav-Sabre_CalDAV.spec +++ b/php-sabredav-Sabre_CalDAV.spec @@ -1,11 +1,12 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name Sabre_CalDAV %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_CalDAV -Version: 1.8.7 +Epoch: 1 +Version: 1.7.9 Release: 1%{?dist} Summary: Provides RFC4791 (CalDAV) support to Sabre_DAV @@ -14,7 +15,7 @@ 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 +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) @@ -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} @@ -59,11 +60,16 @@ fi touch error.lst for fic in $(find Sabre/CalDAV -type f) do - grep $fic %{name}.xml || echo $fic >> error.lst + grep $fic %{name}.xml || echo -$fic >> error.lst +done + +for fic in $(grep '> error.lst done if [ -s error.lst ]; then - : Missing in %{name}.xml + : Error in %{name}.xml cat error.lst exit 1 fi @@ -103,6 +109,9 @@ fi %changelog +* Thu Feb 20 2014 Remi Collet 1:1.7.9-1 +- revert to 1.7 + * Sat Oct 5 2013 Remi Collet 1.8.7-1 - update to 1.8.7 -- cgit