From cebb202c451a76ef95c3a2df87cedab111c53496 Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Feb 21 2008 12:04:54 +0000
Subject: 1.9 preview 2


---

diff --git a/.cvsignore b/.cvsignore
index e0b34e6..53a670d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mono-1.2.6.tar.bz2
+mono-1.9.tar.bz2
diff --git a/mono-1.2.3-use-monodir.patch b/mono-1.2.3-use-monodir.patch
index edaf1a3..3e45822 100644
--- a/mono-1.2.3-use-monodir.patch
+++ b/mono-1.2.3-use-monodir.patch
@@ -4,8 +4,16 @@
  #!/bin/sh
 -exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
 +exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@"
---- mono-1.2.3/scripts/mono-service.in	2007-01-25 06:11:11.000000000 +0000
-+++ mono-1.2.3/scripts/mono-service-new.in	2007-01-27 23:44:26.000000000 +0000
+
+--- mono-1.2.3/scripts/script_umask.in	2006-08-25 20:35:14.000000000 +0100
++++ mono-1.2.3/scripts/script_umask-new.in	2007-01-27 23:45:58.000000000 +0000
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ umask 077
+-exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
++exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@"
+--- mono-1.9/scripts/mono-service.in	2008-02-06 21:43:22.000000000 +0000
++++ mono-1.9/scripts/mono-service-new.in	2008-02-06 21:47:55.000000000 +0000
 @@ -35,7 +35,7 @@
  
  export MONO_DISABLE_SHM=1
@@ -13,13 +21,6 @@
 -   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args
 +   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/mono-service.exe $args
  else
--   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args </dev/null >& /dev/null &
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &
+-   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args </dev/null > /dev/null 2>&1 &
++   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe $args </dev/null > /dev/null 2>&1 &
  fi
---- mono-1.2.3/scripts/script_umask.in	2006-08-25 20:35:14.000000000 +0100
-+++ mono-1.2.3/scripts/script_umask-new.in	2007-01-27 23:45:58.000000000 +0000
-@@ -1,3 +1,3 @@
- #!/bin/sh
- umask 077
--exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
-+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@"
diff --git a/mono.spec b/mono.spec
index dfaa25d..6b62673 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,7 +1,7 @@
-Name:           mono
-Version:        1.2.6
-Release:        7.1%{?dist}
-Summary:        a .NET runtime environment
+Name:	mono
+Version:        1.9
+Release:        1%{?dist}
+Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        GPL, LGPL, MIT X11
@@ -243,7 +243,7 @@ sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH8}
 sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
 %patch1 -p1 -b .selinux-ia64
 %patch2 -p1 -b .ppc-threading
-%patch5 -p1
+%patch5 -p1 -b .monodir
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
 %patch6 -p1 -b .metadata
@@ -328,6 +328,12 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %mono_bin installvst
 %mono_bin monolinker
 %{monodir}/1.0/transform.exe
+%{monodir}/?.0/installutil.*
+%{monodir}/2.1/System*
+%{monodir}/2.1/smcs*
+%{monodir}/2.1/mscorlib*
+%{monodir}/3.5/System.Web.Extensions*
+%{monodir}/3.5/System.Xml.Linq.dll
 %{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
 %{_libdir}/libMonoPosixHelper.so
@@ -348,6 +354,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %dir %{monodir}
 %dir %{monodir}/1.0
 %dir %{monodir}/2.0
+%dir %{monodir}/2.1
+%dir %{monodir}/3.5
 %dir %{monodir}/gac
 %dir %{monodir}/compat-*
 %gac_dll Commons.Xml.Relaxng
@@ -358,8 +366,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %gac_dll Microsoft.VisualC
 %gac_dll Mono.C5
 %gac_dll Mono.Cairo
-%{_libdir}/mono/gac/Mono.Cecil
-%{_libdir}/mono/gac/Mono.Cecil.Mdb
+%{monodir}/gac/Mono.Cecil
+%{monodir}/gac/Mono.Cecil.Mdb
 %gac_dll Mono.Mozilla
 %gac_dll Mono.CompilerServices.SymbolWriter
 %gac_dll Mono.GetOptions
@@ -374,6 +382,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %gac_dll cscompmgd
 %gac_dll CustomMarshalers
 %gac_dll OpenSystem.C
+%{monodir}/gac/System.Xml.Core
+%{monodir}/gac/System.Xml.Linq
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
 %dir %{_sysconfdir}/mono
@@ -383,6 +393,7 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
+%config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
 %{_libdir}/libikvm-native.so
 %mono_bin httpcfg
 
@@ -575,8 +586,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %gac_dll IBM.Data.DB2
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.2.6-7.1
-- Autorebuild for GCC 4.3
+* Mon Feb 04 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.9-1
+- bump to preview 2
+- spec file fixes
 
 * Wed Dec 19 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.6-6.1
 - added BR libunwind-devel for ia64 (bz426180)
diff --git a/sources b/sources
index 830b135..41c5153 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-391f85b4f962269e044ceac2b5235310  mono-1.2.6.tar.bz2
+8301f01119ab5d4ec6107948effebefb  mono-1.9.tar.bz2