[packages/pootle] Revert "- migrated to apache 2.4"

[glen]

commit 4f7529393253d5ce3f7aaabd4b154e1149ca7a04
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Feb 25 19:24:43 2014 +0200

    Revert "- migrated to apache 2.4"
    
    This reverts commit 9a5d29fefc7a8aaebbc95590ace3ec3e28c12849.

 httpd.conf => apache.conf | 9 ++++++---
 pootle.spec               | 9 ++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/pootle.spec b/pootle.spec
index db53622..e436b35 100644
--- a/pootle.spec
+++ b/pootle.spec
@@ -4,13 +4,13 @@
 Summary:	Localization and translation management web application
 Name:		pootle
 Version:	2.1.6
-Release:	3
+Release:	2
 License:	GPL v2
 Group:		Development/Tools
 URL:		http://translate.sourceforge.net/wiki/pootle/index
 Source0:	http://downloads.sourceforge.net/translate/%{fullname}-%{version}.tar.bz2
 # Source0-md5:	1dc69e42cd93f9174443af350df57491
-Source1:	httpd.conf
+Source1:	apache.conf
 Patch0:		settings.patch
 Patch1:		paths.patch
 Patch2:		homedir.patch
@@ -39,7 +39,6 @@ Suggests:	memcached
 Suggests:	python(sqlite)
 Suggests:	python-memcached
 Suggests:	python-xapian
-Conflicts:	apache-base < 2.4.0-1
 Conflicts:	python-xapian < 1.0.13
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -157,10 +156,10 @@ rm -r $RPM_BUILD_ROOT%{py_sitescriptdir}/djblets
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%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}
 
 %files -f %{name}.lang
diff --git a/httpd.conf b/apache.conf
similarity index 79%
rename from httpd.conf
rename to apache.conf
index 59b41c0..64858ca 100644
--- a/httpd.conf
+++ b/apache.conf
@@ -1,16 +1,19 @@
 WSGIScriptAlias /pootle /usr/share/pootle/wsgi.py
 <Directory /usr/share/pootle>
-    Require all granted
+    Order deny,allow
+    Allow from all
 </Directory>
 
 Alias /pootle/html /usr/share/pootle/html
 <Directory /usr/share/pootle/html>
-    Require all granted
+    Order deny,allow
+    Allow from all
 </Directory>
 
 Alias /pootle/export /var/lib/pootle/po
 <Directory "/var/lib/pootle/po">
-    Require all granted
+    Order deny,allow
+    Allow from all
 </Directory>
 
 <IfModule mod_deflate.c>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pootle.git/commitdiff/b042bedccf4f9259b39c85cc9cc1d8d173ffdf6f