Author: goetz
Date: Mon Feb 12 11:16:49 2007
New Revision: 118882
Added:
packages/cooker/apache-mod_mono/current/SOURCES/mod_mono-1.2.1-mdv.patch
Modified:
packages/cooker/apache-mod_mono/current/SPECS/apache-mod_mono.spec
Log:
- fix default configuration to include DirectoryIndex
Added: packages/cooker/apache-mod_mono/current/SOURCES/mod_mono-1.2.1-mdv.patch
==============================================================================
--- (empty file)
+++ packages/cooker/apache-mod_mono/current/SOURCES/mod_mono-1.2.1-mdv.patch
Mon Feb 12 11:16:49 2007
@@ -0,0 +1,26 @@
+--- mod_mono-1.2.1/mod_mono.conf.in.mdv 2006-04-07 22:35:35.000000000
+0200
++++ mod_mono-1.2.1/mod_mono.conf.in 2007-02-12 11:12:14.000000000 +0100
+@@ -1,11 +1,4 @@
+-# mod_mono.conf
+-
+-# Acthung! This file may be overwritten
+-# Use 'include mod_mono.conf' from other configuration file
+-# to load mod_mono module.
+-
+-<IfModule !mod_mono.c>
+- LoadModule mono_module @APXS_LIBEXECDIR@/mod_mono.so
++ LoadModule mono_module extramodules/mod_mono.so
+
+ AddType application/x-asp-net .aspx
+ AddType application/x-asp-net .asmx
+@@ -22,5 +15,9 @@
+ DirectoryIndex index.aspx
+ DirectoryIndex Default.aspx
+ DirectoryIndex default.aspx
+-</IfModule>
+
++ # for ASP 2.0:
++ # MonoServerPath /usr/bin/mod-mono-server2
++
++ MonoUnixSocket /tmp/mod_mono_server
++ Listen 8080
Modified: packages/cooker/apache-mod_mono/current/SPECS/apache-mod_mono.spec
==============================================================================
--- packages/cooker/apache-mod_mono/current/SPECS/apache-mod_mono.spec
(original)
+++ packages/cooker/apache-mod_mono/current/SPECS/apache-mod_mono.spec Mon Feb
12 11:16:49 2007
@@ -7,7 +7,7 @@
Summary: Mono module for Apache 2
Name: apache-mod_mono
Version: %{mod_version}
-Release: %mkrel 2
+Release: %mkrel 3
License: Apache License
Group: System/Servers
URL: http://www.mono-project.com/downloads/
@@ -15,6 +15,7 @@
Source1:
http://www.go-mono.com/sources/xsp/xsp-%{xsp_mod_version}.tar.bz2
Patch0: mod_mono-1.0.4-avoid-version.diff
Patch1: mod_mono-1.1.17-apache223.patch
+Patch2: mod_mono-1.2.1-mdv.patch
Requires(pre): rpm-helper
Requires(postun): rpm-helper
Requires(pre): apache-conf >= 2.2.0
@@ -45,6 +46,7 @@
%setup -q -n %{module_name}-%{mod_version} -a 1
%patch0 -p0
%patch1 -p1 -b .apache223
+%patch2 -p1 -b .mdv
%build
export WANT_AUTOCONF_2_5=1
@@ -80,13 +82,10 @@
install -d 755 %{buildroot}%{_var}/www/.wapi
# Mono Configuration for Apache
-cat > %{buildroot}%{_sysconfdir}/httpd/modules.d/91_mod_mono.conf << EOF
-AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx
-LoadModule mono_module extramodules/mod_mono.so
-MonoUnixSocket /tmp/mod_mono_server
-Listen 8080
-Alias /mono "%{_defaultdocdir}/%{name}-%{mod_version}/test"
-EOF
+install -m 644 mod_mono.conf
%{buildroot}%{_sysconfdir}/httpd/modules.d/91_mod_mono.conf
+# add examples
+echo " Alias /mono \"%{_defaultdocdir}/%{name}-%{mod_version}/test\"" >>
%{buildroot}%{_sysconfdir}/httpd/modules.d/91_mod_mono.conf
+
install src/.libs/mod_mono.so %{buildroot}%{module_path}/mod_mono.so
install -D man/mod_mono.8 %{buildroot}%{_mandir}/man8/mod_mono.8
