[packages/dokuwiki: 12/14] Revert "- migrate to apache 2.4"
glen
glen at pld-linux.org
Wed May 29 22:35:27 CEST 2013
commit c145fd659a0bbb2be098a3c918735423f0d390b2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 29 23:30:54 2013 +0300
Revert "- migrate to apache 2.4"
This reverts commit 02fb90334ed94d9b113cbb2d3ad216959a338c2a.
dokuwiki-httpd.conf | 26 --------------------------
dokuwiki.spec | 10 ++++------
2 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 9d4d6bc..3e411c9 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -7,7 +7,7 @@ Summary: PHP-based Wiki webapplication
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 3
+Release: 2
License: GPL v2
Group: Applications/WWW
Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -27,7 +27,6 @@ Source9: http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
Source10: pld.gif
Source11: http://glen.alkohol.ee/pld/astah.png
# Source11-md5: b1c999e6988440c9e2af6a12e9a56451
-Source12: %{name}-httpd.conf
Patch66: %{name}-config.patch
Patch0: %{name}-paths.patch
Patch1: system-jquery.patch
@@ -66,7 +65,6 @@ Requires: webserver(php)
Suggests: php-adldap >= 3.3.1
Suggests: php-gd
Obsoletes: dokuwiki-plugin-jquery
-Conflicts: apache-base < 2.4.0-1
Conflicts: dokuwiki-plugin-icalevents < 20120909
# can use gz compression to store attic pages
Suggests: php-zlib
@@ -204,7 +202,7 @@ cp -a$l lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -a$l conf/* $RPM_BUILD_ROOT%{_sysconfdir}
cp -a$l data/* $RPM_BUILD_ROOT%{_localstatedir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/acronyms.local.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/entities.local.conf
@@ -258,10 +256,10 @@ fi
%triggerun -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
%triggerin -- lighttpd
diff --git a/dokuwiki-httpd.conf b/dokuwiki-httpd.conf
deleted file mode 100644
index b77baaa..0000000
--- a/dokuwiki-httpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-Alias /dokuwiki /usr/share/dokuwiki
-
-<Directory /usr/share/dokuwiki/>
- Require all granted
-
- <IfModule mod_rewrite.c>
- Options +FollowSymLinks
-
- ## $conf['userewrite'] = 1 - not needed for rewrite mode 2
- RewriteEngine on
-
- ## Not all installations will require the following line. If you do,
- ## change "/dokuwiki" to the path to your dokuwiki directory relative
- ## to your document root.
- RewriteBase /dokuwiki
-
- RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L]
- RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L]
- RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L]
- RewriteRule ^$ doku.php [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule (.*) doku.php?id=$1 [QSA,L]
- RewriteRule ^index.php$ doku.php
- </IfModule>
-</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/118123d2d8aa35bb8bccf03ec3c2756c41f25773
More information about the pld-cvs-commit
mailing list