[packages/horde/HORDE_3_3] Revert "- migrate to apache 2.4"

[glen]

commit cb661a0ff1e25f000c8c4b5ddc621286fc4f4bae
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 15 20:42:40 2014 +0200

    Revert "- migrate to apache 2.4"
    
    This reverts commit 2d3d54c5b83c54683151fb39f8fb4e0b9250397d.

 horde-httpd.conf                | 40 ----------------------------------------
 horde-apache.conf => horde.conf |  2 ++
 horde.spec                      | 12 +++++-------
 3 files changed, 7 insertions(+), 47 deletions(-)
---
diff --git a/horde.spec b/horde.spec
index 7a94061..ceb893a 100644
--- a/horde.spec
+++ b/horde.spec
@@ -14,15 +14,14 @@ Summary(pl.UTF-8):	Wspólny szkielet Horde do wszystkich modułów Horde
 Summary(pt_BR.UTF-8):	Componentes comuns do Horde usados por todos os módulos
 Name:		%{hordeapp}
 Version:	3.3.13
-Release:	3
+Release:	2
 License:	LGPL
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
 # Source0-md5:	5a0486a5f6f96a9957e770ddabe71b38
-Source1:	%{name}-apache.conf
+Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	README.PLD
-Source4:	%{name}-httpd.conf
 Patch0:		%{name}-path.patch
 Patch1:		%{name}-shell.disabled.patch
 Patch3:		%{name}-blank-admins.patch
@@ -79,7 +78,6 @@ Suggests:	wv
 Suggests:	xlhtml
 Obsoletes:	horde-mysql
 Obsoletes:	horde-pgsql
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -194,7 +192,7 @@ cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 > $RPM_BUILD_ROOT/var/log/horde/%{hordeapp}.log
@@ -234,10 +232,10 @@ fi
 %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/horde-httpd.conf b/horde-httpd.conf
deleted file mode 100644
index d18f9e0..0000000
--- a/horde-httpd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<IfModule mod_alias.c>
-    Alias /horde /usr/share/horde
-</IfModule>
-
-<Directory /usr/share/horde>
-    Options Indexes FollowSymLinks
-    AllowOverride None
-    Require all granted
-    <IfModule mod_expires.c>
-        ExpiresActive On
-        ExpiresByType image/png "now plus 1 month"
-        ExpiresByType image/gif "now plus 1 month"
-        ExpiresByType text/javascript "now plus 1 month"
-        ExpiresByType application/x-javascript "now plus 1 month"
-        ExpiresByType text/css "now plus 1 month"
-    </IfModule>
-</Directory>
-
-<Directory "/usr/share/horde/config">
-    Require all denied
-</Directory>
-<Directory "/usr/share/horde/lib">
-    Require all denied
-</Directory>
-<Directory "/usr/share/horde/locale">
-    Require all denied
-</Directory>
-<Directory "/usr/share/horde/rpc">
-    <IfModule mod_rewrite.c>
-        RewriteEngine On
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteRule ^(.*)$ index.php/$1 [QSA,L]
-    </IfModule>
-</Directory>
-<Directory "/usr/share/horde/templates">
-    Require all denied
-</Directory>
-
-# vim: filetype=apache ts=4 sw=4 et
diff --git a/horde-apache.conf b/horde.conf
similarity index 99%
rename from horde-apache.conf
rename to horde.conf
index 021815a..0620eb6 100644
--- a/horde-apache.conf
+++ b/horde.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 <IfModule mod_alias.c>
     Alias /horde /usr/share/horde
 </IfModule>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/9c2a4ab7fcee8cd3f4a253f028c130625ca4bdc8