use unified config for apache versions

diff --git a/apache.conf b/apache.conf
index da501768725ac6ed6d3ac963354a9a6c920bd621..7ca1bc49c872bdd724ecbe671c019267a96f9dbe 100644 (file)
--- a/apache.conf
+++ b/apache.conf
@@ -2,11 +2,25 @@ Alias /ckfinder/userfiles/ /var/lib/ckfinder/
 Alias /ckfinder/ /usr/share/ckfinder/
 
 <Directory /usr/share/ckfinder>
-       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>
 </Directory>
 
 <Directory /var/lib/ckfinder>
-       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_php5.c>
                php_value engine off
        </IfModule>

diff --git a/ckfinder.spec b/ckfinder.spec
index a3cc9a85cbb4234ae66c27df321cdd05588400de..cf3ba015045bcc846bdc95197cfdf9f2140cb70a 100644 (file)
--- a/ckfinder.spec
+++ b/ckfinder.spec
@@ -2,7 +2,7 @@ Summary:        AJAX file manager for web browsers
 Summary(pl.UTF-8):     Edytor tekstowy dla Internetu
 Name:          ckfinder
 Version:       1.4.2
-Release:       2
+Release:       3
 License:       Custom
 Group:         Applications/WWW
 Source0:       http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz

diff --git a/find-lang.sh b/find-lang.sh
old mode 100644 (file)
new mode 100755 (executable)