From 62b60f4cc06bfcdbe21ccf5c52c6d0f287406401 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 21 Jan 2013 20:05:04 +0100
Subject: roundcubemail: fix configuration for httpd 2.4 (missing in backport)

---
 roundcubemail.conf | 8 ++++++++
 roundcubemail.spec | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/roundcubemail.conf b/roundcubemail.conf
index 2e4b213..5911949 100644
--- a/roundcubemail.conf
+++ b/roundcubemail.conf
@@ -5,7 +5,15 @@
 Alias /roundcubemail /usr/share/roundcubemail
 
 <Directory /usr/share/roundcubemail/>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order Deny,Allow
         Deny from all
         Allow from 127.0.0.1
+        Allow from ::1
+    </IfModule>
 </Directory>
diff --git a/roundcubemail.spec b/roundcubemail.spec
index fc84efc..fb17c56 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -2,7 +2,7 @@
 %global _logdir /var/log  
 Name: roundcubemail
 Version:  0.8.4
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -155,6 +155,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Jan 21 2013 Remi Collet <remi@fedoraproject.org> - 0.8.4-3
+- fix configuration for httpd 2.4 (missing in backport)
+
 * Mon Dec 03 2012 Remi Collet <remi@fedoraproject.org> - 0.8.4-2
 - improved Requires
 
-- 
cgit