[owncloud/el6: 2/2] Merge commit '8d444fe0b28aa6e1be1932367110b72aa0f4e8c6' into el6

[Adam Williamson]

commit a6c30e1881d83f58cf94944147fb53d73c084cf1
Merge: b1bb50e 8d444fe
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Jul 29 17:37:14 2014 -0700

    Merge commit '8d444fe0b28aa6e1be1932367110b72aa0f4e8c6' into el6

 owncloud-6.0.0-config.patch |   46 -------------------------------------------
 owncloud-config.php         |   19 +++++++++++++++++
 owncloud.spec               |   13 +++++++----
 3 files changed, 27 insertions(+), 51 deletions(-)
---
diff --cc owncloud.spec
index 11a920d,6bf4dc6..bc003bd
--- a/owncloud.spec
+++ b/owncloud.spec
@@@ -1,7 -1,6 +1,7 @@@
 +
  Name:           owncloud
  Version:        6.0.4
- Release:        1%{?dist}
+ Release:        2%{?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
@@@ -255,10 -252,10 +255,10 @@@ for f in {*.php,*.xml,*.html,occ,robots
  done
  
  # set default config
- install -pm 644 config/config.sample.php    %{buildroot}%{_sysconfdir}/%{name}/config.php
+ install -pm 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/%{name}/config.php
  
  # symlink config dir
 -ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
 +ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
  
  # httpd config
  install -Dpm 644 %{SOURCE1} \