[owncloud] - 6.0.3 - update symfony routing patch - clean up spec

[brummbq]

commit 8142f763eda49d2617c4dff174591d7f25b94277
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Thu May 1 12:56:11 2014 +0200

    - 6.0.3
    - update symfony routing patch
    - clean up spec

 ...=> owncloud-6.0.3-fix-routing-symfony-2.3.patch |    6 ++--
 owncloud.spec                                      |   24 +++++---------------
 2 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/owncloud-6.0.0a-fix-routing-symfony-2.3.patch b/owncloud-6.0.3-fix-routing-symfony-2.3.patch
similarity index 78%
rename from owncloud-6.0.0a-fix-routing-symfony-2.3.patch
rename to owncloud-6.0.3-fix-routing-symfony-2.3.patch
index 76cf3ba..36b72d4 100644
--- a/owncloud-6.0.0a-fix-routing-symfony-2.3.patch
+++ b/owncloud-6.0.3-fix-routing-symfony-2.3.patch
@@ -1,8 +1,8 @@
---- lib/private/router.php.orig	2014-01-23 19:08:24.727637659 +0100
-+++ lib/private/router.php	2014-01-23 19:10:22.945002093 +0100
+--- lib/private/router.php.orig	2014-04-29 03:26:10.000000000 +0200
++++ lib/private/router.php	2014-05-01 12:47:15.993731882 +0200
 @@ -67,7 +67,8 @@
  			$this->useCollection($app);
- 			require_once $file;
+ 			$this->requireRouteFile($file);
  			$collection = $this->getCollection($app);
 -			$this->root->addCollection($collection, '/apps/'.$app);
 +			$collection->addPrefix('/apps/'.$app);
diff --git a/owncloud.spec b/owncloud.spec
index 9177270..7d0fafc 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,5 +1,5 @@
 Name:           owncloud
-Version:        6.0.2
+Version:        6.0.3
 Release:        1%{?dist}
 Summary:        Private file sync and share server
 
@@ -44,7 +44,7 @@ Patch12:        %{name}-6.0.0a-apps_3rdparty_includes.patch
 Patch13:        %{name}-6.0.0a-sharing_backend_log.patch
 # From upstream master:
 # https://github.com/owncloud/core/commit/301d469813763cc28d82986f906eb29a45102294
-Patch14:        %{name}-6.0.0a-fix-routing-symfony-2.3.patch
+Patch14:        %{name}-6.0.3-fix-routing-symfony-2.3.patch
 
 
 BuildArch:      noarch
@@ -177,17 +177,6 @@ cp %{SOURCE5} README.postgresql
 rm -r 3rdparty/{Archive,Console,OS,getid3,phpass,PEAR,symfony,Sabre,Pimple,doctrine,XML}
 rm 3rdparty/{System,class.phpmailer,class.smtp,MDB2,PEAR5}.php 3rdparty/PEAR-LICENSE
 
-# FIXME package
-# Used to generate previews and thumbnails for docx files if LibreOffice
-# or OpenOffice is not available, see lib/private/preview/office-fallback.php
-rm -r 3rdparty/phpdocx
-# Used to generate previews and thumbnails for xls files if LibreOffice
-# or OpenOffice is not available, see lib/private/preview/office-fallback.php
-rm -r 3rdparty/PHPExcel
-# Was added along with PHPExcel, I believe PHPExcel is the only thing that
-# uses it. Note that phpdocx actually contains an entire other copy of dompdf...
-rm -r 3rdparty/dompdf
-
 # individual core apps now bundle libs as well - yay
 rm -r apps/files_encryption/3rdparty/Crypt_Blowfish
 rm -r apps/search_lucene/3rdparty/Zend
@@ -216,11 +205,6 @@ rm -r apps/files_external/3rdparty/{Dropbox,irodsphp,phpseclib}
 # replace OC's use of Patchwork.
 
 ## php-opencloud - https://github.com/rackspace/php-opencloud
-## php-seclib - http://phpseclib.sourceforge.net/
-# Used for the 'external files' app's SFTP option, only uses the
-# NET_SFTP package
-# Review requests: https://bugzilla.redhat.com/show_bug.cgi?id=1047596
-# and dependent tickets
 
 ## google-api-php-client - http://code.google.com/p/google-api-php-client
 # Review request: https://bugzilla.redhat.com/show_bug.cgi?id=1047626
@@ -367,6 +351,10 @@ fi
 
 
 %changelog
+* Thu May 01 2014 Gregor Tätzner <brummbq at fedoraproject.org> - 6.0.3-1
+- 6.0.3
+- update symfony routing patch
+
 * Tue Mar 04 2014 Gregor Tätzner <brummbq at fedoraproject.org> - 6.0.2-1
 - 6.0.2