From 1ca14989159843c8c7b4155b7e2b08fe494ebf17 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 5 Jul 2015 08:22:18 +0200
Subject: owncloud: 8.0.4, backport for remirepo

---
 0001-drop-AWS-autoloader.patch | 74 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 0001-drop-AWS-autoloader.patch

(limited to '0001-drop-AWS-autoloader.patch')

diff --git a/0001-drop-AWS-autoloader.patch b/0001-drop-AWS-autoloader.patch
new file mode 100644
index 0000000..879e1e8
--- /dev/null
+++ b/0001-drop-AWS-autoloader.patch
@@ -0,0 +1,74 @@
+From 28d0809a2c8f79b706cc790e8375197bb04f8620 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Tue, 30 Dec 2014 13:53:54 -0800
+Subject: [PATCH] drop AWS autoloader
+
+Fedora doesn't need it, as the systemwide copy will be found
+by the Composer autoloader.
+---
+ .../3rdparty/aws-sdk-php/aws-autoloader.php        | 37 ----------------------
+ apps/files_external/lib/amazons3.php               |  4 ---
+ 2 files changed, 41 deletions(-)
+ delete mode 100644 apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
+
+diff --git a/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php b/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
+deleted file mode 100644
+index 8072b11..0000000
+--- a/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
++++ /dev/null
+@@ -1,37 +0,0 @@
+-<?php
+-/**
+- * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-require_once __DIR__ . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+-
+-if (!defined('AWS_FILE_PREFIX')) {
+-    define('AWS_FILE_PREFIX', __DIR__);
+-}
+-
+-$classLoader = new Symfony\Component\ClassLoader\UniversalClassLoader();
+-$classLoader->registerNamespaces(array(
+-    'Aws'      => AWS_FILE_PREFIX,
+-    'Guzzle'   => AWS_FILE_PREFIX,
+-    'Symfony'  => AWS_FILE_PREFIX,
+-
+-    // Not needed for basic S3-functionality.
+-    //'Doctrine' => AWS_FILE_PREFIX,
+-    //'Psr'      => AWS_FILE_PREFIX,
+-    //'Monolog'  => AWS_FILE_PREFIX
+-));
+-
+-$classLoader->register();
+-
+-return $classLoader;
+diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
+index 4d94e35..3ceb17a 100644
+--- a/apps/files_external/lib/amazons3.php
++++ b/apps/files_external/lib/amazons3.php
+@@ -24,10 +24,6 @@
+ 
+ namespace OC\Files\Storage;
+ 
+-set_include_path(get_include_path() . PATH_SEPARATOR .
+-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+-require 'aws-autoloader.php';
+-
+ use Aws\S3\S3Client;
+ use Aws\S3\Exception\S3Exception;
+ 
+-- 
+2.2.0
+
-- 
cgit