[owncloud/f19] new upstream release 5.0.18

[Adam Williamson]

commit ecddda9cf24e3d5ded3b177844ac3dd8871990df
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sun Nov 23 17:17:12 2014 -0800

    new upstream release 5.0.18

 .gitignore                             |    1 +
 owncloud-5.0.17-only_follow_http.patch |  155 --------------------------------
 owncloud.spec                          |   11 +--
 sources                                |    2 +-
 4 files changed, 7 insertions(+), 162 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b805f1..964e820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /owncloud-5.0.13-repack.tar.bz2
 /owncloud-5.0.14a-repack.tar.bz2
 /owncloud-5.0.17-repack.tar.bz2
+/owncloud-5.0.18-repack.tar.bz2
diff --git a/owncloud.spec b/owncloud.spec
index c2819dd..09b8afa 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
 Name:           owncloud
-Version:        5.0.17
-Release:        2%{?dist}
+Version:        5.0.18
+Release:        1%{?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
@@ -25,9 +25,6 @@ Patch0:         %{name}-5.0-no_swf.patch
 # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
 # 'plugins:["youtube","vimeo"]'
 Patch1:         %{name}-5.0.17-videoviewer_noplugins.patch
-# Only follow HTTP and HTTPS redirects (security fix). From upstream stable5
-# https://github.com/owncloud/core/commit/cd6de9b8e41c584092821d0a0071351b6426ba32.patch
-Patch2: owncloud-5.0.17-only_follow_http.patch
 
 BuildArch:      noarch
 
@@ -149,7 +146,6 @@ work with an SQLite 3 database stored on the local system.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Drop pre-compiled binary lumps: Flash and Silverlight
 # This means that Flash/Silverlight video/audio fallbacks in the
@@ -338,6 +334,9 @@ fi
 
 
 %changelog
+* Sun Nov 23 2014 Adam Williamson <awilliam at redhat.com> - 5.0.18-1
+- new upstream release 5.0.18, drop patch now merged upstream
+
 * Wed Oct 29 2014 Adam Williamson <awilliam at redhat.com> - 5.0.17-2
 - drop db server deps, clean up docs, disable some admin checks (from master)
 
diff --git a/sources b/sources
index df7cfec..ff377e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4628913e1671c9497e98842d42c47c7b  owncloud-5.0.17-repack.tar.bz2
+1bf37077d8416c59d6d900ab3c81d4a6  owncloud-5.0.18-repack.tar.bz2