[owncloud] fix dropbox autoload patch (thanks Tomas Dolezal) #1168082

Adam Williamson adamwill at fedoraproject.org
Wed Nov 26 05:21:39 UTC 2014


commit 7f13edde99f3c978ae0b408e6fa82cd72e1342aa
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Nov 25 21:21:24 2014 -0800

    fix dropbox autoload patch (thanks Tomas Dolezal) #1168082

 0001-dropbox-use-Composer-autoloader.patch |    4 ++--
 owncloud.spec                              |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/0001-dropbox-use-Composer-autoloader.patch b/0001-dropbox-use-Composer-autoloader.patch
index 722bf4d..12f9697 100644
--- a/0001-dropbox-use-Composer-autoloader.patch
+++ b/0001-dropbox-use-Composer-autoloader.patch
@@ -19,7 +19,7 @@ index db417de..a3f0ebb 100644
  <?php
  
 -require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
-+$loader = require_once OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
++$loader = require \OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 +$loader->add('Dropbox', \OC_App::getAppPath('files_external').'/3rdparty');
  
  OCP\JSON::checkAppEnabled('files_external');
@@ -33,7 +33,7 @@ index cc1e628..b64b5a3 100644
  namespace OC\Files\Storage;
  
 -require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
-+$loader = require_once OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
++$loader = require \OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 +$loader->add('Dropbox', \OC_App::getAppPath('files_external').'/3rdparty');
  
  class Dropbox extends \OC\Files\Storage\Common {
diff --git a/owncloud.spec b/owncloud.spec
index 1271d12..9d48fb3 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        7.0.3
-Release:        2%{?dist}
+Release:        3%{?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
@@ -428,6 +428,9 @@ fi
 
 
 %changelog
+* Tue Nov 25 2014 Adam Williamson <awilliam at redhat.com> - 7.0.3-3
+- fix dropbox autoload patch (thanks Tomas Dolezal) #1168082
+
 * Tue Nov 11 2014 Adam Williamson <awilliam at redhat.com> - 7.0.3-2
 - drop unnecessary bits from 3rdparty_includes.patch
 - split Dropbox loading changes into a separate patch (submitted upstream)


More information about the scm-commits mailing list