X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_mono.spec;h=be8198e495502a9e85e708caaf0510d3fed6fee2;hb=512ee84051dced1abedf51cd939b2d043538c70a;hp=55e31a38d56b513f4b28ae5ec417d8d8581747b1;hpb=16c375e9c2aeb1d4af3134cdd263886db5fd4fe1;p=packages%2Fapache-mod_mono.git

diff --git a/apache-mod_mono.spec b/apache-mod_mono.spec
index 55e31a3..be8198e 100644
--- a/apache-mod_mono.spec
+++ b/apache-mod_mono.spec
@@ -1,26 +1,28 @@
-%define		mod_name mod_mono
-%define 	xsp_version 1.0
 
+# TODO : figure out how to kill mod-mono-server.exe process 
+#	 when apache is restarted
+
+%define		mod_name mod_mono
 Summary:	Mono module for Apache 2
 Summary(pl):	Modu³ Mono dla serwera Apache 2
 Name:		apache-mod_mono
-Version:	1.0
+Version:	1.0.1
 Release:	0.9
 Epoch:		1
 License:	Apache
 Group:		Networking/Daemons
-Source0:	http://mono2.ximian.com/archive/1.0/%{mod_name}-%{version}.tar.gz
-# Source0-md5:	154720f6286105d513d1688f4a6e2b29
-Source1:	http://mono2.ximian.com/archive/1.0/xsp-%{xsp_version}.tar.gz
-# Source1-md5:	cd681f02d0f93774ba126d77fd377f4b
+Source0:	http://mono2.ximian.com/archive/%{version}/%{mod_name}-%{version}.tar.gz
+# Source0-md5:	5adb398b270865c484cea53b79e3def4
 Patch0:		%{name}-apu-config.patch
 URL:		http://www.mono-project.com/
 BuildRequires:	apache-devel >= 2.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:	mono
+BuildRequires:	mono-csharp >= 1.0
+Requires:	xsp
 Requires:	apache >= 2.0
+Requires:	mono-csharp >= 1.0
 Obsoletes:	mod_mono
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,27 +38,24 @@ Unix with Apache and Mono.
 Ten eksperymentalny modu³ umo¿liwia uruchamianie stron ASP.NET na
 Uniksie z serwerem Apache i Mono.
 
+%package -n dotnet-xsp
+Summary:	Mono ASP.NET Standalone Web Server
+Summary(pl):	Server HTTP obs³uguj±cy ASP.NET
+Group:		Networking/Daemons
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	mono-csharp >= 1.0
+
+%description -n dotnet-xsp
+Provides a minimalistic web server which hosts the ASP.NET runtime and 
+can be used to test and debug web applications that use the System.Web
+facilities in  Mono.
+
 %prep
-%setup -q -n %{mod_name}-%{version} -a 1
+%setup -q -n %{mod_name}-%{version}
 %patch0 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
-# Build sample ASP.NET pages from xsp distribution
-cd xsp-%{xsp_version}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-	--with-apxs=%{apxs}
-	
-%{__make} \
-	DESTDIR=$RPM_BUILD_ROOT
-	
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-cd ..
-
 # Build Apache Module
 %{__libtoolize}
 %{__aclocal}
@@ -75,22 +74,17 @@ cd ..
 %{__make} -C src -f makedll.mak
 
 %install
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_pkglibdir},%{_examplesdir}/%{name}-%{version}} \
-	$RPM_BUILD_ROOT%{_httpdir}/{.wapi,mono}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_pkglibdir},%{_mandir}/man8}
 
 install src/.libs/libmod_mono.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_mono.so
 install src/ModMono.dll $RPM_BUILD_ROOT%{_libdir}
-mv -f $RPM_BUILD_ROOT%{_docdir}/xsp/test $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-mv xsp-1.0/INSTALL xsp-1.0/INSTALL-xsp
-mv xsp-1.0/NEWS xsp-1.0/NEWS-xsp
-mv xsp-1.0/README xsp-1.0/README-xsp
-mv xsp-1.0/ChangeLog xsp-1.0/ChangeLog-xsp
+install man/mod_mono.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/70_mod_mono.conf <<EOF
 LoadModule mono_module modules/mod_mono.so
-MonoApplications "/mono:%{_httpdir}/mono"
-Alias /mono "%{_httpdir}/mono"
-<Location /mono>
+MonoApplications "/asp_net:%{_httpdir}/asp_net"
+Alias /asp_net "%{_httpdir}/asp_net"
+<Location /asp_net>
     SetHandler mono
 </Location>
 EOF
@@ -100,12 +94,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog INSTALL NEWS README xsp-1.0/{INSTALL,NEWS,README,ChangeLog}-xsp
-%attr(755,root,root) %{_pkglibdir}/mod_mono.so
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.dll
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/*
-%attr(750,http,http) %{_httpdir}/.wapi
-%dir %{_httpdir}/mono
-%{_mandir}/man1/*
-%{_examplesdir}/%{name}-%{version}
+%doc ChangeLog INSTALL NEWS README
+%attr(755,root,root) %{_pkglibdir}/mod_mono.so
+%attr(755,root,root) %{_libdir}/ModMono.dll
+%{_mandir}/man8/*