[owncloud] unbundle sabredav
brummbq
brummbq at fedoraproject.org
Sat Sep 7 14:00:10 UTC 2013
commit 2b81250c46fab805d5fc0396aff8d6dd80fa684b
Author: Gregor Tätzner <gregor at freenet.de>
Date: Sat Sep 7 15:59:38 2013 +0200
unbundle sabredav
owncloud.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/owncloud.spec b/owncloud.spec
index a20219c..5f9c0e0 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
Version: 5.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -49,7 +49,7 @@ Requires: php-getid3 php-PHPMailer php-cloudfiles php-phpass
Requires: php-pear(Crypt_Blowfish) php-pear(pear.dropbox-php.com/Dropbox)
Requires: php-pear(Net_Curl) php-pear(XML_Parser) php-pear(pear.symfony.com/Routing)
# SabreDAV
-Requires: php-pear(Sabre_CalDAV) php-pear(Sabre_CardDAV)
+Requires: php-pear(Sabre_CalDAV) >= 1.7.8 php-pear(Sabre_CardDAV) >= 1.7.8
%if 0%{?rhel}
Requires(post): policycoreutils-python
@@ -152,9 +152,8 @@ rm -f apps/files_videoviewer/js/silverlightmediaelement.xap
rm -rf apps/media/js/jQuery.jPlayer.2.2.0.source
# Strip bundled libraries from global 3rdparty dir
-# FIXME temporarily bundle sabre - pkg needs upgrade
# FIXME package 'phpseclib'
-rm -rf 3rdparty/{Archive,Console,OS,simpletest,getid3,php-cloudfiles,phpass,PEAR,Dropbox,symfony/routing/Symfony}
+rm -rf 3rdparty/{Archive,Console,OS,simpletest,getid3,php-cloudfiles,phpass,PEAR,Dropbox,symfony/routing/Symfony,Sabre}
rm -f 3rdparty/{Sabre.includes,System,class.phpmailer,class.smtp,MDB2,PEAR5}.php
# individual core apps now bundle libs as well - yay
@@ -324,6 +323,9 @@ fi
%changelog
+* Wed Sep 04 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 5.0.10-4
+- unbundle sabredav again
+
* Fri Aug 23 2013 Adam Williamson <awilliam at redhat.com> - 5.0.10-3
- patch mediaelement not to try and use its plugins
More information about the scm-commits
mailing list