From b481b18570f75800413c26f886ded842a9ce6d11 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Jan 2013 09:21:02 +0100
Subject: [PATCH] fix configuration file for httpd 2.4, #871417

---
 man2html.conf | 15 +++++++++++----
 man2html.spec |  5 ++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/man2html.conf b/man2html.conf
index 13001e9..8c6a37a 100644
--- a/man2html.conf
+++ b/man2html.conf
@@ -1,7 +1,14 @@
 ScriptAlias /man/ "/usr/lib/man2html/cgi-bin/man/"
 <Directory "/usr/lib/man2html/cgi-bin/man">
     Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from 127.0.0.1
-</Directory>
\ No newline at end of file
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        AllowOverride None
+        Order allow,deny
+        Allow from 127.0.0.1
+    </IfModule>
+</Directory>
diff --git a/man2html.spec b/man2html.spec
index 99640be..e906a36 100644
--- a/man2html.spec
+++ b/man2html.spec
@@ -3,7 +3,7 @@
 
 Name:       man2html
 Version:    1.6
-Release:    9.%{posttag}%{?dist}
+Release:    10.%{posttag}%{?dist}
 Summary:    Convert man pages to HTML - CGI scripts
 
 # man2html.c and debian/sources/man2html.cgi.c are Copyright Only
@@ -197,6 +197,9 @@ rm -f %{_localstatedir}/cache/man2html/* || :
 
 
 %changelog
+* Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.6-10.g
+- fix configuration file for httpd 2.4, #871417
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-9.g
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild