[packages/owncloud/DEVEL] Revert "migrated to apache 2.4"

[wiget]

commit 3115cbfb64cc847d7ff055269507ba85e8bd38e3
Author: Artur Frysiak <artur at frysiak.net>
Date:   Wed Jun 12 21:36:26 2013 +0200

    Revert "migrated to apache 2.4"
    
    This reverts commit fc9336bdb9c269f029acb83b52110adb74945437.

 httpd.conf    | 25 -------------------------
 owncloud.spec |  8 +++-----
 2 files changed, 3 insertions(+), 30 deletions(-)
---
diff --git a/owncloud.spec b/owncloud.spec
index 6645095..a41d3e4 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -22,7 +22,6 @@ Source0:	http://download.owncloud.org/community/%{name}-%{version}.tar.bz2
 Source1:	config.php
 Source2:	apache.conf
 Source3:	lighttpd.conf
-Source4:	httpd.conf
 Patch1:		system-config.patch
 Patch2:		pear-not-strict.patch
 URL:		http://owncloud.org
@@ -63,7 +62,6 @@ Suggests:	php-pear-MDB2_Driver_mysql
 Suggests:	php-pear-MDB2_Driver_pgsql
 Suggests:	php-pear-MDB2_Driver_sqlite
 Suggests:	php-pear-MDB2_Driver_sqlite3
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -98,7 +96,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 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.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}
@@ -112,10 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index d269367..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-Alias /owncloud /usr/share/owncloud
-<Directory /usr/share/owncloud>
-	ErrorDocument 403 /owncloud/core/templates/403.php
-	ErrorDocument 404 /owncloud/core/templates/404.php
-	<IfModule mod_php5.c>
-		php_value upload_max_filesize 512M
-		php_value post_max_size 512M
-		php_value memory_limit 512M
-	</IfModule>
-	<IfModule mod_rewrite.c>
-		RewriteEngine on
-		RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-		RewriteRule ^.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
-		RewriteRule ^.well-known/carddav /owncloud/remote.php/carddav/ [R]
-		RewriteRule ^.well-known/caldav /owncloud/remote.php/caldav/ [R]
-		RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
-		RewriteRule ^remote/(.*) remote.php [QSA,L]
-	</IfModule>
-	Options -Indexes
-	Require all granted
-</Directory>
-
-<Directory /usr/share/owncloud/data>
-	Require all denied
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/1e0c84478afba573fa8b97cda5b0dd82519d8d88