migrate .htaccess contents to apache.conf

diff --git a/dokuwiki-apache.conf b/dokuwiki-apache.conf
index c195ca87e173a3454d4b6bbf5f2e1498cd68bb35..b79c953ca5904747f55592f7bf212d63540d6b7f 100644 (file)
--- a/dokuwiki-apache.conf
+++ b/dokuwiki-apache.conf
@@ -23,3 +23,7 @@ Alias /dokuwiki /usr/share/dokuwiki
                RewriteRule ^index.php$               doku.php
        </IfModule>
 </Directory>
+
+<Directory ~ /usr/share/dokuwiki/(conf|inc|bin|data)>
+       Deny from all
+</Directory>

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 059affc1b5da0a3f9f5a37cc6b6bffd1e716d193..00457eef513c607baa2aa3b2f09f0675c038ab22 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.14
+Release:       0.15
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -160,8 +160,9 @@ mv conf/acl.auth.php{.dist,}
 mv conf/users.auth.php{.dist,}
 mv conf/mysql.conf.php{.example,}
 
-find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess conf/.htaccess
+find -name _dummy | xargs %{__rm}
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html
+%{__rm} {conf,inc,bin,data,inc/lang}/.htaccess
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files