From 629fbc3f45058623fe81b48c1f3dc5085ac7b9cf Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Aug 26 2008 17:44:00 +0000
Subject: Bump to 2.0 preview 1 release


---

diff --git a/.cvsignore b/.cvsignore
index cb7c0ee..87734b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xsp-1.9.1.tar.bz2
+xsp-2.0.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..5f8f48f
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+xsp-2_0-1_fc10:HEAD:xsp-2.0-1.fc10.src.rpm:1219772599
diff --git a/sources b/sources
index 8138cc2..274cb5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f53f440714a8126d7221212c6d79ea11  xsp-1.9.1.tar.bz2
+f3b05b8c1a896e8166e862d0ac57dd4b  xsp-2.0.tar.bz2
diff --git a/xsp-2.0-configure.patch b/xsp-2.0-configure.patch
new file mode 100644
index 0000000..3dfa2b4
--- /dev/null
+++ b/xsp-2.0-configure.patch
@@ -0,0 +1,11 @@
+--- xsp-2.0/configure.in	2008-08-05 17:30:13.000000000 +0100
++++ xsp-2.0/configure-new.in	2008-08-05 17:32:19.000000000 +0100
+@@ -73,7 +73,7 @@
+ echo "$CS compiler: $MCS"
+ test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
+ 
+-GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib'
++GACUTIL_FLAGS='-root $(DESTDIR)$(libdir)'
+ 
+ # Put the version in the new required format (for svn revisions)
+ export VERSION
diff --git a/xsp.patch b/xsp.patch
deleted file mode 100644
index 316ee6e..0000000
--- a/xsp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- xsp-1.1.17/configure.in	2006-08-25 20:55:56.000000000 +0100
-+++ xsp-1.1.17/configure.in	2006-08-31 00:29:53.000000000 +0100
-@@ -56,7 +56,7 @@
- echo "$CS compiler: $MCS"
- test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
- 
--GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib'
-+GACUTIL_FLAGS='-root $(DESTDIR)$(libdir)'
- 
- AC_SUBST(MCS)
- AC_SUBST(GMCS)
---- xsp-1.1.17/scripts/Makefile.am	2006-08-25 20:55:56.000000000 +0100
-+++ xsp-1.1.17/scripts/Makefile.am	2006-08-31 00:32:55.000000000 +0100
-@@ -12,10 +12,10 @@
- 
- CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool_scripts) $(tool2_scripts)
- 
--plat_bindir = $(prefix)/lib/mono/1.0
--plat_bindir2 = $(prefix)/lib/mono/2.0
--plat_tooldir = $(prefix)/lib/xsp/1.0
--plat_tooldir2 = $(prefix)/lib/xsp/2.0
-+plat_bindir = $(libdir)/mono/1.0
-+plat_bindir2 = $(libdir)/mono/2.0
-+plat_tooldir = $(libdir)/xsp/1.0
-+plat_tooldir2 = $(libdir)/xsp/2.0
- 
- REWRITE = sed \
- 	-e 's,@''plat_bindir@,$(plat_bindir),g'		\
-
-
diff --git a/xsp.spec b/xsp.spec
index 18188fa..e2ea340 100644
--- a/xsp.spec
+++ b/xsp.spec
@@ -1,18 +1,18 @@
 Name:     	xsp
-Version: 	1.9.1
-Release:	2%{?dist}
-License:	BSD
+Version: 	2.0
+Release:	1%{?dist}
+License:	MIT
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:		http://www.mono-project.com/ASP.NET
 Source0:	http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: xsp.patch
+Patch0: xsp-2.0-configure.patch
 Patch1: xsp-makes.patch
 Patch2: xsp-test-makefile.patch
-BuildRequires:	mono-web, mono-data, mono-core, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
-Requires:	mono-core
+BuildRequires:	mono-web, mono-data, mono-devel >= 2.0, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
+Requires:	mono-core >= 2.0
 Summary:	A small web server that hosts ASP.NET
 Group:		System Environment/Daemons
-ExcludeArch:	ppc64
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %define debug_package %{nil}
 
@@ -40,9 +40,9 @@ Files for testing the xsp server
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+%patch0 -p1 -b .config
+%patch1 -p1 -b .makes
+%patch2 -p1 -b .test-make
 autoreconf
 
 %build
@@ -89,6 +89,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/xsp/test
 
 %changelog
+* Sun Aug 03 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-1
+- bump to 2.0 preview 1
+- spec file fixes
+
 * Mon Apr 21 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.9.1-1
 - bump