summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-07-05 08:22:18 +0200
committerRemi Collet <fedora@famillecollet.com>2015-07-05 08:22:18 +0200
commit1ca14989159843c8c7b4155b7e2b08fe494ebf17 (patch)
tree931472cd11646599753dbc4cf6c40c5a4d83d802
parent7840065569de84a135711318d66e5bcf8827097e (diff)
owncloud: 8.0.4, backport for remirepo
-rw-r--r--0001-drop-AWS-autoloader.patch74
-rw-r--r--Makefile3
-rw-r--r--owncloud.spec33
3 files changed, 110 insertions, 0 deletions
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
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..cd3c95f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
diff --git a/owncloud.spec b/owncloud.spec
index 4037e62..43704ed 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,7 +1,17 @@
+# remirepo spec file for owncloud from:
+#
+# Fedora spec file for owncloud
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
Name: owncloud
Version: 8.0.4
Release: 3%{?dist}
Summary: Private file sync and share server
+Group: Applications/Internet
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
URL: http://owncloud.org
@@ -63,6 +73,7 @@ Patch7: owncloud-8.0.0-disable_minify.patch
# Distributors are on the case.
Patch8: owncloud-8.0.3-dont_update_htacess.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# expand pear macros on install
@@ -158,6 +169,7 @@ applications and plugins.
%package httpd
Summary: Httpd integration for ownCloud
+Group: Applications/Internet
Provides: %{name}-webserver = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -171,6 +183,7 @@ Requires: php
%package nginx
Summary: Nginx integration for ownCloud
+Group: Applications/Internet
Provides: %{name}-webserver = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -184,6 +197,7 @@ Requires: php-fpm nginx
%package mysql
Summary: MySQL database support for ownCloud
+Group: Applications/Internet
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -202,6 +216,7 @@ more details.
%package postgresql
Summary: PostgreSQL database support for ownCloud
+Group: Applications/Internet
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -221,6 +236,7 @@ for more details.
%package sqlite
Summary: SQLite 3 database support for ownCloud
+Group: Applications/Internet
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -336,6 +352,8 @@ rm -r apps/updater
%install
+rm -rf %{buildroot}
+
install -dm 755 %{buildroot}%{_datadir}/%{name}
# create owncloud datadir
@@ -435,7 +453,12 @@ if [ $1 -eq 0 ]; then
fi
+%clean
+rm -rf %{buildroot}
+
+
%files
+%defattr(-,root,root,-)
%doc AUTHORS COPYING-AGPL README.fedora config/config.sample.php
%dir %attr(-,apache,apache) %{_sysconfdir}/%{name}
@@ -450,21 +473,31 @@ fi
%files httpd
+%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%{_sysconfdir}/httpd/conf.d/%{name}-access.conf.avail
%{_sysconfdir}/httpd/conf.d/*.inc
%files nginx
+%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/nginx/conf.d/%{name}.conf
%files mysql
+%defattr(-,root,root,-)
%doc README.mysql
+
%files postgresql
+%defattr(-,root,root,-)
%doc README.postgresql
+
%files sqlite
+%defattr(-,root,root,-)
%changelog
+* Sun Jul 5 2015 Remi Collet <remi@remirepo.net> - 8.0.4-3
+- backport for remimrepo
+
* Sat Jul 04 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 8.0.4-3
- Fix Symfony max version (2.6 changed to 3.0)