[owncloud/f19: 17/17] backport config file change from master, lucene dep

[Adam Williamson]

commit 1b326a14a0d2dfe809deee10bc30c8f89a4fe593
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Oct 28 20:37:58 2014 -0700

    backport config file change from master, lucene dep
    
    Backport the change where we ship a small config stub containing
    only our modified settings (seems to work fine for OC 5 too),
    and make the Zend dep be on Lucene as that's needed by core
    even in OC 5 (spotted in system logs in testing)

 owncloud.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/owncloud.spec b/owncloud.spec
index 2016dfb..24762d3 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -14,21 +14,20 @@ Source6:        %{name}-4.5-nginx.conf
 Source3:        %{name}-README.fedora
 Source4:        %{name}-mysql.txt
 Source5:        %{name}-postgresql.txt
+Source7:        %{name}-config.php
 
 # used to repack the source tarball
 Source42:       %{name}-delete-jslint.sh
 
-# adjust default config
-Patch0:         %{name}-5.0.8-config.patch
 # Explain lack of jplayer Flash fallback in Fedora
-Patch1:         %{name}-5.0-no_swf.patch
+Patch0:         %{name}-5.0-no_swf.patch
 # Adjust mediaelement not to use its SWF and Silverlight plugins. This
 # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
 # 'plugins:["youtube","vimeo"]'
-Patch2:         %{name}-5.0.17-videoviewer_noplugins.patch
+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
-Patch3: owncloud-5.0.17-only_follow_http.patch
+Patch2: owncloud-5.0.17-only_follow_http.patch
 
 BuildArch:      noarch
 
@@ -42,12 +41,13 @@ Requires:       %{name}-database = %{version}-%{release}
 # core PHP libs
 Requires:       php-gd php-curl php-dom php-exif php-fileinfo php-gmp php-iconv
 Requires:       php-json php-ldap php-mbstring php-openssl php-pcre php-pdo
-Requires:       php-session php-simplexml php-spl php-zip php-ZendFramework
+Requires:       php-session php-simplexml php-spl php-zip
 %if 0%{?fedora} || 0%{?rhel} > 6
 Requires:       php-filter
 %endif
 # other PHP libs
 Requires:       php-getid3 php-PHPMailer php-cloudfiles php-phpass
+Requires:       php-ZendFramework-Search-Lucene
 # PHP PEAR dependencies
 Requires:       php-pear(Crypt_Blowfish) php-pear(pear.dropbox-php.com/Dropbox)
 Requires:       php-pear(Net_Curl) php-pear(XML_Parser) php-pear(pear.symfony.com/Routing)
@@ -136,10 +136,9 @@ Requires:   php-pear(MDB2)
 
 %prep
 %setup -q -n %{name}
-%patch0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Drop pre-compiled binary lumps: Flash and Silverlight
 # This means that Flash/Silverlight video/audio fallbacks in the
@@ -227,7 +226,7 @@ install -pm 644 {index,public,remote,status,cron}.php   %{buildroot}%{_datadir}/
 install -pm 644 robots.txt                  %{buildroot}%{_datadir}/%{name}
 install -pm 644 index.html                  %{buildroot}%{_datadir}/%{name}
 install -pm 644 db_structure.xml            %{buildroot}%{_datadir}/%{name}
-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 -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config