[packages/mediawiki] - migrated to apache 2.4

[baggins]

commit 3848a96c554f6a2d2a47a47b4b2e912361059197
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 22:42:06 2013 +0200

    - migrated to apache 2.4

 mediawiki.conf => mediawiki-apache.conf |  5 -----
 mediawiki-httpd.conf                    | 19 +++++++++++++++++++
 mediawiki.spec                          | 12 +++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/mediawiki.spec b/mediawiki.spec
index b083a29..0a55de7 100644
--- a/mediawiki.spec
+++ b/mediawiki.spec
@@ -8,12 +8,13 @@ Summary:	MediaWiki - the collaborative editing software that runs Wikipedia
 Summary(pl.UTF-8):	MediaWiki - oprogramowanie do wspólnej edycji, na którym działa Wikipedia
 Name:		mediawiki
 Version:	1.20.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://download.wikimedia.org/mediawiki/1.20/%{name}-%{version}.tar.gz
 # Source0-md5:	ad0e4c2319bc80713da2b8bf74091c3f
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 Patch0:		%{name}-confdir2.patch
 URL:		http://www.mediawiki.org/
 BuildRequires:	sed >= 4.0
@@ -34,6 +35,7 @@ Requires:	webapps
 #Suggests:	ImageMagick or php-gd for thumbnails
 #Suggests:	php-mmcache || php4-mmcache
 #Suggests:	php-zlib
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,7 +93,7 @@ ln -s %{_vardir}/cache $RPM_BUILD_ROOT%{_appdir}
 ln -s %{_vardir}/images $RPM_BUILD_ROOT%{_appdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,10 +116,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 1.5.3-0.2
diff --git a/mediawiki.conf b/mediawiki-apache.conf
similarity index 91%
rename from mediawiki.conf
rename to mediawiki-apache.conf
index 2cc0c29..9f541e0 100644
--- a/mediawiki.conf
+++ b/mediawiki-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 Alias /mediawiki	/usr/share/mediawiki
 
 <Directory /usr/share/mediawiki>
@@ -8,9 +6,6 @@ Alias /mediawiki	/usr/share/mediawiki
 	php_value memory_limit 20M
 	php_admin_value open_basedir "/etc/webapps/mediawiki:/usr/share/mediawiki/"
 
-#	for apache2
-#	AcceptPathInfo On
-
 #	<IfModule mod_rewrite.c>
 #		# when using rewrite rules please read first
 #		# http://meta.wikimedia.org/wiki/Rewrite_rules
diff --git a/mediawiki-httpd.conf b/mediawiki-httpd.conf
new file mode 100644
index 0000000..b966c0e
--- /dev/null
+++ b/mediawiki-httpd.conf
@@ -0,0 +1,19 @@
+Alias /mediawiki	/usr/share/mediawiki
+
+<Directory /usr/share/mediawiki>
+	Require all granted
+
+	php_value memory_limit 20M
+	php_admin_value open_basedir "/etc/webapps/mediawiki:/usr/share/mediawiki/"
+
+	AcceptPathInfo On
+
+#	<IfModule mod_rewrite.c>
+#		# when using rewrite rules please read first
+#		# http://meta.wikimedia.org/wiki/Rewrite_rules
+#		RewriteEngine on
+#
+#		# do the rewrite (not tested)
+#		RewriteRule ^mediawiki/?(.*)$ /mediawiki/index.php?title=$1 [L,QSA]
+#	</IfModule>
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mediawiki.git/commitdiff/3848a96c554f6a2d2a47a47b4b2e912361059197