[packages/owncloud] Revert "- removed SOURCE4 (httpd.conf) as not used since last commit"

wiget wiget at pld-linux.org
Wed Jul 24 16:15:06 CEST 2013


commit c8d63963991d30fc03d683e2b57c3c7312b23ba8
Author: Artur Frysiak <artur at frysiak.net>
Date:   Wed Jul 24 12:36:05 2013 +0200

    Revert "- removed SOURCE4 (httpd.conf) as not used since last commit"
    
    Don't remove httpd.conf. Use SOURCE2 for it.
    
    This reverts commit 43ee4ca45fa6349219e6b0adde6c5c8afeb932cf.

 owncloud.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/owncloud.spec b/owncloud.spec
index a26c57e..6cf6ad1 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -95,6 +95,7 @@ ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_appdir}/config
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config/config.php
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
@@ -125,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING-AGPL COPYING-README README
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %dir %attr(750,http,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config
 %attr(640,http,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config/*.php
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/9f4b865acf4b7ad9451546545f3ea168d2b91ee6



More information about the pld-cvs-commit mailing list