[zoneminder] fix configuration file for httpd 2.4, #871502

[Remi Collet]

commit ae3d33f9c6b326a5f72f6631c0e8edca26141472
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Jan 7 14:56:59 2013 +0100

    fix configuration file for httpd 2.4, #871502

 zoneminder.conf |   26 +++++++++++++++++++-------
 zoneminder.spec |    5 ++++-
 2 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/zoneminder.conf b/zoneminder.conf
index 4a4d932..597ea2b 100644
--- a/zoneminder.conf
+++ b/zoneminder.conf
@@ -14,20 +14,32 @@
 
 Alias /zm "/usr/share/zoneminder/www"
 <Directory "/usr/share/zoneminder/www">
-    Options -Indexes MultiViews FollowSymLinks
+    Options -Indexes +MultiViews +FollowSymLinks
     AllowOverride All
-    Order allow,deny
-    Allow from all
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
     # The code unfortunately uses short tags in many places
     php_value short_open_tag 1
-
-Deny from all # DELETE THIS LINE
 </Directory>
 
 ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
 <Directory "/usr/libexec/zoneminder/cgi-bin">
     AllowOverride All
     Options ExecCGI
-    Order allow,deny
-    Allow from all
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
 </Directory>
diff --git a/zoneminder.spec b/zoneminder.spec
index b3a3a0f..b8c618c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Jan  7 2013 Remi Collet <rcollet at redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
 - rebuild against new libjpeg