From a81be2137167a401ef4859313fd5de62a89e86bd Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 28 Jul 2015 09:37:38 +0200
Subject: owncloud: 8.0.5, backported from Fedora

---
 owncloud-8.0.4-google_autoload.patch | 23 +++++++++++++++++++++++
 owncloud.spec                        | 14 ++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 owncloud-8.0.4-google_autoload.patch

diff --git a/owncloud-8.0.4-google_autoload.patch b/owncloud-8.0.4-google_autoload.patch
new file mode 100644
index 0000000..9565bad
--- /dev/null
+++ b/owncloud-8.0.4-google_autoload.patch
@@ -0,0 +1,23 @@
+--- owncloud/apps/files_external/lib/google.php	2015-06-04 06:43:13.000000000 -0700
++++ owncloud/apps/files_external/lib/google.php.new	2015-07-01 15:53:19.363382205 -0700
+@@ -23,8 +23,7 @@
+ 
+ set_include_path(get_include_path().PATH_SEPARATOR.
+ 	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
+-require_once 'Google/Client.php';
+-require_once 'Google/Service/Drive.php';
++require_once 'Google/autoload.php';
+ 
+ class Google extends \OC\Files\Storage\Common {
+ 
+--- owncloud/apps/files_external/ajax/google.php	2015-06-04 06:43:13.000000000 -0700
++++ owncloud/apps/files_external/ajax/google.php.new	2015-07-01 15:53:28.051505933 -0700
+@@ -1,7 +1,7 @@
+ <?php
+ set_include_path(get_include_path().PATH_SEPARATOR.
+ 	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
+-require_once 'Google/Client.php';
++require_once 'Google/autoload.php';
+ 
+ OCP\JSON::checkAppEnabled('files_external');
+ OCP\JSON::checkLoggedIn();
diff --git a/owncloud.spec b/owncloud.spec
index 43704ed..453e26e 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -8,8 +8,8 @@
 # Please preserve changelog entries
 #
 Name:           owncloud
-Version:        8.0.4
-Release:        3%{?dist}
+Version:        8.0.5
+Release:        1%{?dist}
 Summary:        Private file sync and share server
 Group:          Applications/Internet
 
@@ -72,6 +72,11 @@ Patch7:        owncloud-8.0.0-disable_minify.patch
 # Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
 # Distributors are on the case.
 Patch8:         owncloud-8.0.3-dont_update_htacess.patch
+# Use Google autoloader instead of including particular files. Upstream
+# no longer has each file include all others it needs, they expect you
+# to use the autoloader. Can't go upstream until upstream bumps to a
+# version of the lib that actually includes the autoloader...
+Patch9:         owncloud-8.0.4-google_autoload.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -260,6 +265,7 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # prepare package doc
 cp %{SOURCE3} README.fedora
@@ -495,6 +501,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 10 2015 Adam Williamson <awilliam@redhat.com> - 8.0.5-1
+- new release 8.0.5 (should fix app enabling, RHBZ #1240776)
+- patch to use Google lib autoloader
+
 * Sun Jul  5 2015 Remi Collet <remi@remirepo.net> - 8.0.4-3
 - backport for remimrepo
 
-- 
cgit