[php-horde-Horde-Dav/el6] use php-sabredav-Sabre_VObject instead of php-sabre-vobject

Remi Collet remi at fedoraproject.org
Fri Mar 20 16:54:48 UTC 2015


commit 21eddfd3375de8097f6277f25015910270ef6b9a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Mar 20 17:51:45 2015 +0100

    use php-sabredav-Sabre_VObject instead of php-sabre-vobject
    
    (cherry picked from commit 8c156921c7129ca50742bcd0047a102be6ba622d)

 php-horde-Horde-Dav.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/php-horde-Horde-Dav.spec b/php-horde-Horde-Dav.spec
index 4e9da90..866dd2e 100644
--- a/php-horde-Horde-Dav.spec
+++ b/php-horde-Horde-Dav.spec
@@ -13,7 +13,7 @@
 
 Name:           php-horde-Horde-Dav
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Horde library for WebDAV, CalDAV, CardDAV
 
 Group:          Development/Libraries
@@ -45,12 +45,8 @@ Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0
 Requires:       php-pear(%{pear_channel}/Horde_Translation) <  3.0.0
 # php-sabredav-Sabre_DAV is 1.7, php-sabre-dav is 1.8
 Requires:       php-sabre-dav  >= 1.8.10
-%if 0%{?rhel} == 6
-Requires:       php-sabre-vobject >= 2.1.4
-%else
 # php-sabredav-Sabre_VObject is 2.1, php-sabre-vobject is  3.1
 Requires:       php-pear(Sabre_VObject) >= 2.1.4
-%endif
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -125,6 +121,9 @@ fi
 
 
 %changelog
+* Fri Mar 20 2015 Remi Collet <remi at fedoraproject.org> - 1.1.2-1.1
+- use php-sabredav-Sabre_VObject instead of php-sabre-vobject
+
 * Wed Dec 03 2014 Remi Collet <remi at fedoraproject.org> - 1.1.2-1
 - Update to 1.1.2
 - add dependency on Horde_Translation


More information about the scm-commits mailing list