apache <2.4/2.4 support

diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index b79c953ca5904747f55592f7bf212d63540d6b7f..dad8b75f0baf80f3fbe5683e79bf218b750f72d2 100644 (file)
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -1,6 +1,13 @@
 Alias /dokuwiki /usr/share/dokuwiki
 <Directory /usr/share/dokuwiki/>
-       Allow from all
+       <IfModule mod_authz_core.c>
+               # Apache 2.4
+               Require all granted
+       </IfModule>
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
 
        <IfModule mod_rewrite.c>
                Options +FollowSymLinks
@@ -25,5 +32,12 @@ Alias /dokuwiki /usr/share/dokuwiki
 </Directory>
 
 <Directory ~ /usr/share/dokuwiki/(conf|inc|bin|data)>
-       Deny from all
+       <IfModule mod_authz_core.c>
+               # Apache 2.4
+               Require all denied
+       </IfModule>
+       <IfModule !mod_authz_core.c>
+               Order deny,allow
+               Deny from all
+       </IfModule>
 </Directory>

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 00457eef513c607baa2aa3b2f09f0675c038ab22..55f765bec0ec2e9aaf769dfe298e8fb96c4b24e6 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.15
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz