[packages/pootle] - migrated to apache 2.4

[baggins]

commit 9a5d29fefc7a8aaebbc95590ace3ec3e28c12849
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 16 22:03:49 2013 +0200

    - migrated to apache 2.4

 apache.conf => httpd.conf | 9 +++------
 pootle.spec               | 9 +++++----
 2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/pootle.spec b/pootle.spec
index e436b35..db53622 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:	2
+Release:	3
 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:	apache.conf
+Source1:	httpd.conf
 Patch0:		settings.patch
 Patch1:		paths.patch
 Patch2:		homedir.patch
@@ -39,6 +39,7 @@ 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)
@@ -156,10 +157,10 @@ rm -r $RPM_BUILD_ROOT%{py_sitescriptdir}/djblets
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files -f %{name}.lang
diff --git a/apache.conf b/httpd.conf
similarity index 79%
rename from apache.conf
rename to httpd.conf
index 64858ca..59b41c0 100644
--- a/apache.conf
+++ b/httpd.conf
@@ -1,19 +1,16 @@
 WSGIScriptAlias /pootle /usr/share/pootle/wsgi.py
 <Directory /usr/share/pootle>
-    Order deny,allow
-    Allow from all
+    Require all granted
 </Directory>
 
 Alias /pootle/html /usr/share/pootle/html
 <Directory /usr/share/pootle/html>
-    Order deny,allow
-    Allow from all
+    Require all granted
 </Directory>
 
 Alias /pootle/export /var/lib/pootle/po
 <Directory "/var/lib/pootle/po">
-    Order deny,allow
-    Allow from all
+    Require all granted
 </Directory>
 
 <IfModule mod_deflate.c>
================================================================

---- gitweb:

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