- up to 1.0

- rel 0.1

Changed files:
    apache-mod_mono.spec -> 1.12

diff --git a/apache-mod_mono.spec b/apache-mod_mono.spec
index de904e6c6f4aedee4d286f4d775ce7a366e4d4b7..15a031591d6b752eabf88be93531f1727dac352c 100644 (file)
--- a/apache-mod_mono.spec
+++ b/apache-mod_mono.spec
@@ -1,29 +1,31 @@
-%define        mod_name mod_mono
-%define xsp_version 0.4
+%define                mod_name mod_mono
+%define        xsp_version 1.0
+
 Summary:       Mono module for Apache 2
 Summary(pl):   Modu³ Mono dla serwera Apache 2
 Name:          apache-mod_mono
-Version:       0.3.7
-Release:       1
+Version:       1.0
+Release:       0.1
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
-Source0:       http://www.apacheworld.org/modmono/%{version}/%{mod_name}-%{version}.tar.gz
-# Source0-md5: 75c7f682ce585382827bb179369a86cc
-Source1:       http://go-mono.com/archive/xsp-%{xsp_version}.tar.gz
-# Source1-md5: aacb2d6b0dc3f54382c09be0976f6a7f
-Source2:       mono.conf
-URL:           http://www.apacheworld.org/modmono/
+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
+Patch0:                %{name}-apu-config.patch
+URL:           http://www.mono-project.com/
 BuildRequires: apache-devel >= 2.0
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: mono
 Requires:      apache >= 2.0
-#Requires:     httpd-mmn = %(cat %{_includedir}/httpd/.mmn)
 Obsoletes:     mod_mono
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                httpdir         /home/services/httpd
-%define                moddir          /usr/lib/apache
+%define        apxs            %{_sbindir}/apxs
+%define                _httpdir        /home/services/httpd
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %description
 This is an experimental module that allows you to run ASP.NET pages on
@@ -34,37 +36,55 @@ Ten eksperymentalny modu
 Uniksie z serwerem Apache i Mono.
 
 %prep
-%setup -q -n %{mod_name}-0.3 -a 1
+%setup -q -n %{mod_name}-%{version} -a 1
+%patch0 -p1
 
 %build
 # Build sample ASP.NET pages from xsp distribution
 cd xsp-%{xsp_version}
-%{__make}
-%{__make} install
+
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \
+       --with-apxs=%{apxs}
+       
+%{__make} \
+       DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
 cd ..
 
 # Build Apache Module
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
+%{__automake}
+
 %configure \
-       --with-apxs=%{_sbindir}/apxs
-%{__make}
+       --with-apxs=%{apxs} \
+       --with-apr-config=%{_bindir}/apr-config \
+       --with-apu-config=%{_bindir}/apu-config
+       
+%{__make} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 # Build Mono DLL
 %{__make} -C src -f makedll.mak
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{moddir}} \
-       $RPM_BUILD_ROOT%{httpdir}/{.wapi,mono}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_pkglibdir}} \
+       $RPM_BUILD_ROOT%{_httpdir}/{.wapi,mono}
 
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/
-install src/.libs/libmod_mono.so $RPM_BUILD_ROOT%{moddir}/mod_mono.so
+install src/.libs/libmod_mono.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_mono.so
 install src/ModMono.dll $RPM_BUILD_ROOT%{_libdir}
-cp -r xsp-%{xsp_version}/server/test/* $RPM_BUILD_ROOT%{httpdir}/mono/
+cp -r xsp-%{xsp_version}/test/*.{exe,aspx,ashx,png,webapp,dll,xml,config} $RPM_BUILD_ROOT%{_httpdir}/mono/
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/70_mod_mono.conf <<EOF
 LoadModule mono_module lib/apache/mod_mono.so
-MonoApplication /mono %{httpdir}/mono/
+MonoApplication /mono %{_httpdir}/mono/
 EOF
 
 %clean
@@ -73,9 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog INSTALL NEWS README
-%attr(755,root,root) %{moddir}/mod_mono.so
+%attr(755,root,root) %{_pkglibdir}/mod_mono.so
 %{_libdir}/ModMono.dll
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/*
-%attr(750,http,http) %{httpdir}/.wapi
+%attr(750,http,http) %{_httpdir}/.wapi
 %defattr(644,http,http,755)
-%{httpdir}/mono
+%{_httpdir}/mono