[owncloud] fix routing with symfony 2.3

[brummbq]

commit c154c1da2737e6e5694021b9d42a8d1e82c58977
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Tue Jan 14 11:15:33 2014 +0100

    fix routing with symfony 2.3

 owncloud-6.0.0a-fix-routing-symfony-2.3.patch |   12 ++++++++++++
 owncloud.spec                                 |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/owncloud-6.0.0a-fix-routing-symfony-2.3.patch b/owncloud-6.0.0a-fix-routing-symfony-2.3.patch
new file mode 100644
index 0000000..eb01bfb
--- /dev/null
+++ b/owncloud-6.0.0a-fix-routing-symfony-2.3.patch
@@ -0,0 +1,12 @@
+--- lib/private/router.php.orig	2014-01-14 11:07:39.431045132 +0100
++++ lib/private/router.php	2014-01-14 11:08:37.635889412 +0100
+@@ -67,7 +67,8 @@
+ 			$this->useCollection($app);
+ 			require_once $file;
+ 			$collection = $this->getCollection($app);
+-			$this->root->addCollection($collection, '/apps/'.$app);
++			$collection->addPrefix('/apps/'.$app);
++			$this->root->addCollection($collection);
+ 		}
+ 		$this->useCollection('root');
+ 		require_once 'settings/routes.php';
diff --git a/owncloud.spec b/owncloud.spec
index cbfabf7..d046270 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
 Version:        6.0.0a
-Release:        8%{?dist}
+Release:        9%{?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
@@ -42,6 +42,8 @@ Patch12:        %{name}-6.0.0a-apps_3rdparty_includes.patch
 # Upstream is coming up with something, but in the meantime, make it
 # a debug message instead.
 Patch13:        %{name}-6.0.0a-sharing_backend_log.patch
+# upstreamable should work with symfony < 2.2 as well
+Patch14:        %{name}-6.0.0a-fix-routing-symfony-2.3.patch
 
 BuildArch:      noarch
 
@@ -160,6 +162,7 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
 %patch11
 %patch12 -p1
 %patch13 -p1
+%patch14
 
 # prepare package doc
 cp %{SOURCE3} README.fedora
@@ -361,6 +364,9 @@ fi
 
 
 %changelog
+* Tue Jan 14 2014 Gregor Tätzner <brummbq at fedoraproject.org>
+- fix routing with symfony 2.3
+
 * Fri Jan 10 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-8
 - make a warning OC keeps triggering into a debug message