[owncloud] update to 8.0.1 RC1, rediff patches, drop now-upstreamed patch

[Adam Williamson]

commit 93bff0f09a5edeb0840e0dbc971160efd3b50132
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Mar 6 17:25:38 2015 -0800

    update to 8.0.1 RC1, rediff patches, drop now-upstreamed patch

 owncloud-8.0.0-dbal_251.patch                      | 24 ----------------------
 ....patch => owncloud-8.0.1-autoloader_paths.patch |  4 ++--
 ...ch => owncloud-8.0.1-composer_includepath.patch |  2 +-
 owncloud.spec                                      | 16 +++++++--------
 4 files changed, 11 insertions(+), 35 deletions(-)
---
diff --git a/owncloud-8.0.0-autoloader_paths.patch b/owncloud-8.0.1-autoloader_paths.patch
similarity index 77%
rename from owncloud-8.0.0-autoloader_paths.patch
rename to owncloud-8.0.1-autoloader_paths.patch
index 3cc1c89..bb471f8 100644
--- a/owncloud-8.0.0-autoloader_paths.patch
+++ b/owncloud-8.0.1-autoloader_paths.patch
@@ -10,5 +10,5 @@
 +			$loader->add('Sabre', '/usr/share/php');
 +			$loader->add('Sabre\VObject', '/usr/share/pear');
  		} else {
- 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
- 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
+			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+			// we can't use the template error page here, because this needs the
diff --git a/owncloud-7.0.2-composer_includepath.patch b/owncloud-8.0.1-composer_includepath.patch
similarity index 82%
rename from owncloud-7.0.2-composer_includepath.patch
rename to owncloud-8.0.1-composer_includepath.patch
index c1cb04e..f7b3a56 100644
--- a/owncloud-7.0.2-composer_includepath.patch
+++ b/owncloud-8.0.1-composer_includepath.patch
@@ -7,4 +7,4 @@
 +			$loader->setUseIncludePath(true);
  		} else {
  			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
- 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
+			// we can't use the template error page here, because this needs the
diff --git a/owncloud.spec b/owncloud.spec
index 2d3e8a7..e6798b0 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,13 +1,13 @@
 Name:           owncloud
-Version:        8.0.0
-Release:        6%{?dist}
+Version:        8.0.1
+Release:        0.1.rc1%{?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
 URL:            http://owncloud.org
 # Tarball with non-free sources stripped. To generate:
 # ./owncloud-delete-nonfree.sh %%{name}-%%{version}.tar.bz2
-Source0:        %{name}-%{version}-repack.tar.bz2
+Source0:        %{name}-%{version}RC1-repack.tar.bz2
 # orig source:  https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2
 # sha256sum: https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2.sha256
 # snapshot source: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
@@ -41,12 +41,12 @@ Patch1:         %{name}-6.0.2-videoviewer_noplugins.patch
 # and *test* if changing this; test with all versions of all Sabre packages
 # installed to make sure it DTRT. Keep an eye on upstream for future changes
 # also.
-Patch2:        %{name}-8.0.0-autoloader_paths.patch
+Patch2:        %{name}-8.0.1-autoloader_paths.patch
 # Turn on include path usage for the Composer autoloader (so it'll find
 # systemwide PSR-0 and PSR-4 compliant libraries)
 # Upstream wouldn't likely take this, they probably only care about their
 # bundled copies
-Patch3:        %{name}-7.0.2-composer_includepath.patch
+Patch3:        %{name}-8.0.1-composer_includepath.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+
@@ -62,8 +62,6 @@ 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:         0001-setup-allow-disabling-all-htaccess-fiddling.patch
-# Fix OC for DBAL 2.5.1: https://github.com/owncloud/core/pull/14119
-Patch9:         owncloud-8.0.0-dbal_251.patch
 
 BuildArch:      noarch
 
@@ -246,7 +244,6 @@ 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
@@ -465,6 +462,9 @@ fi
 
 
 %changelog
+* Fri Mar 06 2015 Adam Williamson <awilliam at redhat.com> - 8.0.1-0.1.rc1
+- update to 8.0.1rc1
+
 * Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-6
 - extend the htaccess patch to cover updater as well as initial setup
 - rebase apache config stuff again, private dir denials only on 8.x branch