multi apache version config

diff --git a/trac-apache.conf b/trac-apache.conf
index c2b60aa35f07ec23df38b820ebf35cce0d59c9e9..046739906781d6184dbe6887ec7cbb99a128e73d 100644 (file)
--- a/trac-apache.conf
+++ b/trac-apache.conf
@@ -6,8 +6,15 @@ AliasMatch ^/trac/([^/]+)/chrome/common/(.*) /usr/share/trac/htdocs/$2
 AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3
 
 <Directory "/usr/share/trac/htdocs">
-       Order allow,deny
-       Allow from all
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Directory>
 
 # TracModPython
@@ -32,7 +39,15 @@ AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3
                <IfModule mod_env.c>
                        SetEnv TRAC_ENV_PARENT_DIR /var/lib/trac
                </IfModule>
-               Allow from all
+               # Apache 2.x
+               <IfModule !mod_authz_core.c>
+                       Order allow,deny
+                       Allow from all
+               </IfModule>
+               # Apache 2.4
+               <IfModule mod_authz_core.c>
+                       Require all granted
+               </IfModule>
        </Location>
 </IfModule>
 
@@ -42,5 +57,4 @@ AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3
        AuthName "trac"
        AuthUserFile /etc/webapps/trac/htpasswd
        Require valid-user
-       Allow from all
 </Location>

diff --git a/trac.spec b/trac.spec
index dd7f75db6e8063da29d7da0f6d7a77b7c2a1e418..a66600e020ef64ec53dc8d4a9e5154c465aed367 100644 (file)
--- a/trac.spec
+++ b/trac.spec
@@ -6,7 +6,7 @@ Summary(pl.UTF-8):      Zintegrowane scm, wiki, system śledzenia problemów i środo
 Name:          trac
 # NOTE 1.x is on DEVEL branch, finish it there and then merge
 Version:       0.12.5
-Release:       4
+Release:       5
 License:       BSD-like
 Group:         Applications/WWW
 Source0:       http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz