[owncloud] simplify dropbox autoloader patch (just drop it entirely a la AWS)

[Adam Williamson]

commit 48b0f986462dbade684d743af8e50345adc3d785
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Feb 23 16:01:47 2015 -0800

    simplify dropbox autoloader patch (just drop it entirely a la AWS)

 0001-dropbox-use-Composer-autoloader.patch   | 43 ----------------------------
 owncloud-8.0.0-drop-dropbox-autoloader.patch | 25 ++++++++++++++++
 owncloud.spec                                | 12 +++++---
 3 files changed, 33 insertions(+), 47 deletions(-)
---
diff --git a/owncloud-8.0.0-drop-dropbox-autoloader.patch b/owncloud-8.0.0-drop-dropbox-autoloader.patch
new file mode 100644
index 0000000..45acd2c
--- /dev/null
+++ b/owncloud-8.0.0-drop-dropbox-autoloader.patch
@@ -0,0 +1,25 @@
+diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
+index db417de..a752ca1 100644
+--- a/apps/files_external/ajax/dropbox.php
++++ b/apps/files_external/ajax/dropbox.php
+@@ -1,7 +1,5 @@
+ <?php
+ 
+-require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
+-
+ OCP\JSON::checkAppEnabled('files_external');
+ OCP\JSON::checkLoggedIn();
+ OCP\JSON::callCheck();
+diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
+index cc1e628..586efd6 100644
+--- a/apps/files_external/lib/dropbox.php
++++ b/apps/files_external/lib/dropbox.php
+@@ -22,8 +22,6 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
+-
+ class Dropbox extends \OC\Files\Storage\Common {
+ 
+ 	private $dropbox;
diff --git a/owncloud.spec b/owncloud.spec
index 25d8670..687921e 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        8.0.0
-Release:        4%{?dist}
+Release:        5%{?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
@@ -47,9 +47,10 @@ Patch2:        %{name}-8.0.0-autoloader_paths.patch
 # Upstream wouldn't likely take this, they probably only care about their
 # bundled copies
 Patch3:        %{name}-7.0.2-composer_includepath.patch
-# Submitted upstream: https://github.com/owncloud/core/pull/12113
-# Use Composer autoloader for Dropbox (in apps/files_external/3rdparty)
-Patch4:        0001-dropbox-use-Composer-autoloader.patch
+# Drop use of dropbox's unnecessary autoloader (composer will find the
+# systemwide copy). This is not upstreamable, but see
+# https://github.com/owncloud/core/pull/12113 with similar effect for 8.1+
+Patch4:        %{name}-8.0.0-drop-dropbox-autoloader.patch
 # Submitted upstream: https://github.com/owncloud/core/pull/11056
 # Be less heavy-handed about clearing the opcache after editing config.php
 # Avoids triggering a crash in php-opcache: https://github.com/owncloud/core/issues/9885
@@ -464,6 +465,9 @@ fi
 
 
 %changelog
+* Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-5
+- simplify dropbox autoloader patch (just drop it entirely a la AWS)
+
 * Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-4
 - unbundle php-natxet-cssmin, add getid3 to the list of symlink hacks