Sun Nov 2 21:06:18 UTC 2008

Author: pfj

Update of /cvs/pkgs/rpms/mono/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2452/F-9

Modified Files:
	.cvsignore mono-1.2.3-use-monodir.patch mono-libdir-126.patch 
	mono.spec sources 
Added Files:
	import.log mono-2.0-BinarySerialization.patch 
	mono-2.0-DataTable.patch mono-2.0-StringReplace.patch 
	mono-2.0-metadata-makefile.patch mono-2.0-mimeicon.patch 
	mono-2.0-monoservice.patch mono-2.0-pcfiles.patch 
	mono-2.0-ppc-threading.patch mono-2.0-tablelayout.patch 
	mono-2.0-uselibdir.patch 
Removed Files:
	mono-1.1.13.4-ppc-threading.patch 
	mono-1.1.13.4-selinux-ia64.patch mono-1.2.4-metadata.patch 
	mono-1251-metadata.patch 
Log Message:

Update to 2.0.1

--- NEW FILE import.log ---
mono-2_0_1-13_fc10:F-9:mono-2.0.1-13.fc10.src.rpm:1225659940

mono-2.0-BinarySerialization.patch:

--- NEW FILE mono-2.0-BinarySerialization.patch ---
--- trunk/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs	2008/09/16 12:52:47	113147
+++ trunk/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs	2008/09/16 12:53:08	113148
@@ -172,6 +172,59 @@
 		dt.Rows[0].RejectChanges();
 		dt.Rows[1].RejectChanges();
 	}
+
+	[Test]
+	public void TestDefaultValues ()
+	{
+	 	//Serialize Table
+		DataTable tb1 = new DataTable ();
+		tb1.Columns.Add ("id", typeof (int));
+		tb1.Columns.Add ("Date", typeof (string));
+		tb1.Columns["id"].DefaultValue = 10;
+		tb1.Columns["Date"].DefaultValue = "9/15/2008";
+		tb1.Rows.Add (tb1.NewRow());
+
+		MemoryStream ms = new MemoryStream ();
+		BinaryFormatter bf = new BinaryFormatter ();
+		tb1.RemotingFormat = SerializationFormat.Binary;
+		bf.Serialize (ms,tb1);
+		byte [] serializedStream = ms.ToArray ();
+		ms.Close ();
+		//DserializeTable
+		ms = new MemoryStream (serializedStream);
+		DataTable dt = (DataTable)bf.Deserialize (ms);
+		ms.Close ();
+
+		//Table Data
+		for (int i = 0; i < tb1.Rows.Count; i++) 
+			for (int j = 0; j < tb1.Columns.Count; j++) {
+				Assert.AreEqual (tb1.Columns[j].DefaultValue, dt.Rows [i][j], "#1 Element differs from DefaultValue at Row :{0} Column :{1}", i, j);
+				Assert.AreEqual (tb1.Rows [i][j], dt.Rows [i][j], "#2 Elements differ at Row :{0} Column :{1}", i, j);
+			}
+	}
+
+	[Test]
+	public void TestEmptyTable ()
+	{
+	 	//Serialize Table
+		DataTable tb1 = new DataTable ();
+		tb1.Columns.Add ("id", typeof (int));
+		tb1.Columns.Add ("Date", typeof (string));
+
+		MemoryStream ms = new MemoryStream ();
+		BinaryFormatter bf = new BinaryFormatter ();
+		tb1.RemotingFormat = SerializationFormat.Binary;
+		bf.Serialize (ms,tb1);
+		byte [] serializedStream = ms.ToArray ();
+		ms.Close ();
+		//DserializeTable
+		ms = new MemoryStream (serializedStream);
+		DataTable dt = (DataTable)bf.Deserialize (ms);
+		ms.Close ();
+
+		Assert.AreEqual(tb1.Rows.Count, dt.Rows.Count);
+	}
+
 	[Test]
 	public void Test_With_Null_Values1 ()
 	{

mono-2.0-DataTable.patch:

--- NEW FILE mono-2.0-DataTable.patch ---
--- trunk/mcs/class/System.Data/System.Data/DataTable.cs	2008/09/16 12:52:47	113147
+++ trunk/mcs/class/System.Data/System.Data/DataTable.cs	2008/09/16 12:53:08	113148
@@ -2497,6 +2497,8 @@
 		internal void DeserializeRecords (ArrayList arrayList, ArrayList nullBits, BitArray rowStateBitArray)
 		{
 			BitArray  nullBit = null;
+			if (arrayList == null || arrayList.Count < 1)
+				return;
 			int len = ((Array) arrayList [0]).Length;
 			object [] tmpArray = new object [arrayList.Count];
 			int k = 0;
@@ -2566,8 +2568,8 @@
 				Columns[i].Prefix = info.GetString (prefix + "Prefix");
 				Columns[i].DataType = (Type) info.GetValue (prefix + "DataType",
 									    typeof (Type));
-				Columns[i].DefaultValue = (DBNull) info.GetValue (prefix + "DefaultValue",
-										  typeof (DBNull));
+				Columns[i].DefaultValue = info.GetValue (prefix + "DefaultValue",
+										  typeof (Object));
 				Columns[i].AllowDBNull = info.GetBoolean (prefix + "AllowDBNull");
 				Columns[i].AutoIncrement = info.GetBoolean (prefix + "AutoIncrement");
 				Columns[i].AutoIncrementStep = info.GetInt64 (prefix + "AutoIncrementStep");
@@ -2752,6 +2754,8 @@
 			}
 			SerializeConstraints (info, prefix + "Constraints");
 			for (int j = 0; j < columnsCount; j++) {
+				if (rowsCount == 0)
+					continue;
 				BitArray nullBits = new BitArray (rowsCount);
 				Array recordArray = Array.CreateInstance (Rows[0][j].GetType (), recordsCount);
 				DataColumn column = Columns [j];
@@ -2775,7 +2779,7 @@
 						version = DataRowVersion.Default;
 					}
 					if (dr.IsNull (column, version) == false) {
-						nullBits [l] =  false;
+						nullBits [l] = false;
 						recordArray.SetValue (dr [j, version], l);
 					} else {
 						nullBits [l] = true;

mono-2.0-StringReplace.patch:

--- NEW FILE mono-2.0-StringReplace.patch ---
Index: corlib/System/String.cs
===================================================================
--- mono-2.0/mcs/class/corlib/System/String.cs	(revision 112532)
+++ mono-2.0/mcs/class/corlib/System/String.cs	(working copy)
@@ -1689,6 +1689,8 @@
 					}
 					i = found + oldValue.length;
 				}
+				if (count == 0)
+					return this;
 				int nlen = this.length + ((newValue.length - oldValue.length) * count);
 				String tmp = InternalAllocateStr (nlen);
 
Index: corlib/System.Text/StringBuilder.cs
===================================================================
--- mono-2.0/mcs/class/corlib/System.Text/StringBuilder.cs	(revision 112532)
+++ mono-2.0/mcs/class/corlib/System.Text/StringBuilder.cs	(working copy)
@@ -309,15 +309,22 @@
 			if (oldValue.Length == 0)
 				throw new ArgumentException ("The old value cannot be zero length.");
 
-			// TODO: OPTIMIZE!
-			string replace = _str.Substring(startIndex, count).Replace(oldValue, newValue);
+			string substr = _str.Substring(startIndex, count);
+			string replace = substr.Replace(oldValue, newValue);
+			// return early if no oldValue was found
+			if ((object) replace == (object) substr)
+				return this;
 
 			InternalEnsureCapacity (replace.Length + (_length - count));
 
-			string end = _str.Substring (startIndex + count, _length - startIndex - count );
+			// shift end part
+			if (replace.Length < count)
+				String.CharCopy (_str, startIndex + replace.Length, _str, startIndex + count, _length - startIndex  - count);
+			else if (replace.Length > count)
+				String.CharCopyReverse (_str, startIndex + replace.Length, _str, startIndex + count, _length - startIndex  - count);
 
+			// copy middle part back into _str
 			String.CharCopy (_str, startIndex, replace, 0, replace.Length);
-			String.CharCopy (_str, startIndex + replace.Length, end, 0, end.Length);
 			
 			_length = replace.Length + (_length - count);
 

mono-2.0-metadata-makefile.patch:

--- NEW FILE mono-2.0-metadata-makefile.patch ---
--- mono-2.0/mono/metadata/Makefile.am	2008-08-03 13:29:57.000000000 +0100
+++ mono-2.0/mono/metadata/Makefile-new.am	2008-08-03 15:50:47.000000000 +0100
@@ -9,7 +9,7 @@
 # optimisation is required to actually inline them
 AM_CFLAGS = -O
 else
-assembliesdir = $(exec_prefix)/lib
+assembliesdir = $(libdir)
 confdir = $(sysconfdir)
 endif
 
@@ -21,7 +21,7 @@
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.

mono-2.0-mimeicon.patch:

--- NEW FILE mono-2.0-mimeicon.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs	2008-09-02 16:46:50.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon-new.cs	2008-09-18 23:29:05.000000000 +0100
@@ -358,11 +358,12 @@
 				if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable")
 					image = ResourceImageLoader.Get ("text-x-generic.png");
 			}
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+			}
 		}
 		
 		public override object AddAndGetIconIndex (string filename, string mime_type)
@@ -370,11 +371,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (filename, mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}
@@ -384,11 +385,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}

mono-2.0-monoservice.patch:

--- NEW FILE mono-2.0-monoservice.patch ---
--- mono-2.0/scripts/mono-service.in	2008-08-03 08:12:55.000000000 +0100
+++ mono-2.0/scripts/mono-service-new.in	2008-08-03 08:17:46.000000000 +0100
@@ -35,7 +35,7 @@
 
 export MONO_DISABLE_SHM=1
 if $debug; then
-   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 2>&1 &
+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null > /dev/null 2>&1 &
 fi

mono-2.0-pcfiles.patch:

--- NEW FILE mono-2.0-pcfiles.patch ---
--- mono-2.0/data/cecil.pc.in	2008-07-01 18:51:06.000000000 +0100
+++ mono-2.0/data/cecil.pc-new.in	2008-08-03 16:00:19.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
 
 Name: Mono Internal -- Do not use.
--- mono-2.0/data/mint.pc.in	2008-07-01 18:51:07.000000000 +0100
+++ mono-2.0/data/mint.pc-new.in	2008-08-03 16:00:07.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 
 
--- mono-2.0/data/mono-cairo.pc.in	2008-07-01 18:51:07.000000000 +0100
+++ mono-2.0/data/mono-cairo.pc-new.in	2008-10-16 22:24:15.000000000 +0100
@@ -1,9 +1,9 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: Mono.Cairo
 Description: Cairo bindings for Mono
 Version: @VERSION@
-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
+Libs: -r:@libdir@/mono/1.0/Mono.Cairo.dll
--- mono-2.0/data/mono.pc.in	2008-07-01 18:51:07.000000000 +0100
+++ mono-2.0/data/mono.pc-new.in	2008-08-03 15:59:18.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=${pcfiledir}/../..
 exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
 includedir=${prefix}/include/mono- at API_VER@
 sysconfdir=@sysconfdir@
 
--- mono-2.0/data/smcs.pc.in	2008-07-15 18:24:01.000000000 +0100
+++ mono-2.0/data/smcs.pc-new.in	2008-08-03 15:59:02.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
 Libraries=${assemblies_dir}/2.1/smcs.exe
 
 Name: Mono Internal -- Do not use.

mono-2.0-ppc-threading.patch:

--- NEW FILE mono-2.0-ppc-threading.patch ---
--- mono-2.0/mono/mini/main.c	2008-08-03 07:49:23.000000000 +0100
+++ mono-2.0/mono/mini/main-new.c	2008-08-03 07:55:10.000000000 +0100
@@ -23,10 +23,16 @@
 }
 
 #else
-
+#include <sched.h>
 int
 main (int argc, char* argv[])
 {
+    /* On PowerPC call sched_setaffinity to bind to one CPU only
+     * to work around parallelism bug on G5 SMP */
+    #ifdef __powerpc__
+    unsigned long mask = 1;
+    sched_setaffinity(0, sizeof(mask), &mask);
+    #endif
 	return mono_main (argc, argv);
 }
 

mono-2.0-tablelayout.patch:

--- NEW FILE mono-2.0-tablelayout.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter.cs	2008-09-02 16:46:51.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Layout/TableLayoutSettingsTypeConverter-new.cs	2008-09-17 16:09:48.000000000 +0100
@@ -119,7 +119,7 @@
 
 			XmlDocument xmldoc = new XmlDocument();
 			xmldoc.LoadXml (value as string);
-			TableLayoutSettings settings = new TableLayoutSettings(new TableLayoutPanel ());
+			TableLayoutSettings settings = new TableLayoutSettings(null);
 			int count = ParseControl (xmldoc, settings);
 			ParseColumnStyle (xmldoc, settings);
 			ParseRowStyle (xmldoc, settings);

mono-2.0-uselibdir.patch:

--- NEW FILE mono-2.0-uselibdir.patch ---
--- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2008-08-03 07:58:47.000000000 +0100
+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs	2008-08-03 08:06:47.000000000 +0100
@@ -53,10 +53,10 @@
 			//xbuildDir = Path.Combine (t2.FullName, "xbuild");
 			// /usr/local/lib
 			t3 = t2.Parent;
+			libDir = t3.FullName;
 			// /usr/local
 			t4 = t3.Parent;
 			binDir = Path.Combine (t4.FullName, "bin");
-			libDir = Path.Combine (t4.FullName, "lib");
 		}
 	
 		internal static string GetBinDir ()


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	16 Apr 2008 21:16:44 -0000	1.20
+++ .cvsignore	2 Nov 2008 21:06:17 -0000	1.21
@@ -1 +1 @@
-mono-1.9.1.tar.bz2
+mono-2.0.1.tar.bz2

mono-1.2.3-use-monodir.patch:

Index: mono-1.2.3-use-monodir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-9/mono-1.2.3-use-monodir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-1.2.3-use-monodir.patch	21 Feb 2008 12:04:54 -0000	1.2
+++ mono-1.2.3-use-monodir.patch	2 Nov 2008 21:06:17 -0000	1.3
@@ -12,15 +12,3 @@
  umask 077
 -exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
 +exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .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
- if $debug; then
--   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 2>&1 &
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null > /dev/null 2>&1 &
- fi

mono-libdir-126.patch:

Index: mono-libdir-126.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-9/mono-libdir-126.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-libdir-126.patch	23 Apr 2008 14:59:23 -0000	1.2
+++ mono-libdir-126.patch	2 Nov 2008 21:06:17 -0000	1.3
@@ -89,35 +89,3 @@
  				return dir;
  			return Path.Combine (dir, "lib");
  		}
---- mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs.libdir	2006-08-17 15:46:11.000000000 +0200
-+++ mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2006-08-17 15:46:53.000000000 +0200
-@@ -53,10 +53,10 @@
- 			xbuildDir = Path.Combine (t2.FullName, "xbuild");
- 			// /usr/local/lib
- 			t3 = t2.Parent;
-+			libDir = t3.FullName;
- 			// /usr/local
- 			t4 = t3.Parent;
- 			binDir = Path.Combine (t4.FullName, "bin");
--			libDir = Path.Combine (t4.FullName, "lib");
- 		}
- 	
- 		public static string GetBinDir ()
-diff -up mono-1.9.1/data/cecil.pc.in.BAD mono-1.9.1/data/cecil.pc.in
---- mono-1.9.1/data/cecil.pc.in.BAD	2008-04-23 10:12:29.000000000 -0400
-+++ mono-1.9.1/data/cecil.pc.in	2008-04-23 10:12:40.000000000 -0400
-@@ -1,4 +1,4 @@
--assemblies_dir=@prefix@/lib/mono
-+assemblies_dir=@prefix@/@reloc_libdir@/mono
- Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
- 
- Name: Mono Internal -- Do not use.
-diff -up mono-1.9.1/data/mono-cairo.pc.in.BAD mono-1.9.1/data/mono-cairo.pc.in
---- mono-1.9.1/data/mono-cairo.pc.in.BAD	2008-04-23 10:11:10.000000000 -0400
-+++ mono-1.9.1/data/mono-cairo.pc.in	2008-04-23 10:11:16.000000000 -0400
-@@ -6,4 +6,4 @@ includedir=${prefix}/include
- Name: Mono.Cairo
- Description: Cairo bindings for Mono
- Version: @VERSION@
--Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
-+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-9/mono.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mono.spec	11 Oct 2008 15:40:24 -0000	1.75
+++ mono.spec	2 Nov 2008 21:06:17 -0000	1.76
@@ -1,20 +1,20 @@
 Name:		mono
-Version:        1.9.1
-Release:        3%{?dist}
+Version:        2.0.1
+Release:        13%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
-License:        GPLv2 and LGPLv2+ and MIT
+License:        MIT
 URL:            http://go-mono.com/sources-stable/%{name}-%{version}.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	monodir.c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bison
+BuildRequires:  bison 
 BuildRequires:  glib2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  libicu-devel
-BuildRequires:  libgdiplus-devel >= 1.2.6
+BuildRequires:  libgdiplus-devel >= 2.0
 BuildRequires:  zlib-devel
 %ifarch ia64
 BuildRequires:  libunwind
@@ -30,18 +30,24 @@
 BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparcv9 alpha
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha s390 s390x
 # Disabled due to strange build failure:
 # s390 s390x
 
-Patch1: mono-1.1.13.4-selinux-ia64.patch
-Patch2: mono-1.1.13.4-ppc-threading.patch
+Patch2: mono-2.0-ppc-threading.patch
 Patch3: mono-libdir-126.patch
 Patch4: mono-1.2.3-use-monodir.patch
-Patch5: mono-1.2.4-metadata.patch
-Patch6: mono-1251-metadata.patch
-Patch7: mono-big-integer-CVE-2007-5197.patch
+Patch5: mono-big-integer-CVE-2007-5197.patch
 Patch8: mono-mcs-config.patch
+Patch7: mono-2.0-pcfiles.patch
+Patch6:mono-2.0-uselibdir.patch
+Patch9:mono-2.0-monoservice.patch
+Patch10: mono-2.0-metadata-makefile.patch
+Patch11: mono-2.0-tablelayout.patch
+Patch12: mono-2.0-mimeicon.patch
+Patch13: mono-2.0-BinarySerialization.patch
+Patch14: mono-2.0-DataTable.patch
+Patch15: mono-2.0-StringReplace.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -249,13 +255,20 @@
 sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH8}
 %patch8 -p1 -b .config
 sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
-%patch1 -p1 -b .selinux-ia64
 %patch2 -p1 -b .ppc-threading
-%patch5 -p1 -b .monodir
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
-%patch6 -p1 -b .metadata
-%patch7 -p0 -b .big-integer
+%patch6 -p1 -b .use-libdir
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
+%patch7 -p1 -b .pc-patches
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
+%patch9 -p1 -b .monoservice
+%patch10 -p1 -b .metadata
+%patch11 -p1 -b .tablelayout
+%patch12 -p1 -b .mimeicon
+%patch13 -p1 -b .serialisation
+%patch14 -p1 -b .datatable
+%patch15 -p1 -b .stringreplace
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -265,7 +278,7 @@
 rm -rf mcs/class/lib/monolite/*
 
 %build
-%ifarch ia64 s390
+%ifarch ia64 s390 s390x
 export CFLAGS="-O2 -fno-strict-aliasing"
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -274,7 +287,7 @@
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes 
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes --with-moonlight=no --disable-static --with-preview=yes --with-libgdiplus=installed
 make
 
 
@@ -283,15 +296,12 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 install monodir $RPM_BUILD_ROOT%{_bindir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.a
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # We put these inside rpm
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-provides
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-requires
 
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/mbas
-
 # This was removed upstream:
 %{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]*
 %{__rm} -rf $RPM_BUILD_ROOT%{monodir}/1.0/Mono.Security.Win32.dll
@@ -308,8 +318,10 @@
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mint.1
 %{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/CorCompare.exe
 %{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe*
-%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe
-%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
+#%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe
+#%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe
+%{__rm} $RPM_BUILD_ROOT/%_bindir/smcs
+%{__rm} $RPM_BUILD_ROOT/%_libdir/pkgconfig/smcs.pc
 
 %post -p /sbin/ldconfig
 
@@ -328,13 +340,16 @@
 %{_bindir}/mono
 %{_bindir}/monodir
 %{_bindir}/mono-api-*
-%{_bindir}/smcs
+%{monodir}/1.0/mono-api-diff*
+%{monodir}/?.0/mono-api-info*
 %{_bindir}/mono-test-install
+%{_bindir}/gacutil2
 %mono_bin certmgr
 %mono_bin chktrust
 %mono_bin gacutil
 %mono_bin gmcs
 %mono_bin mcs
+%{_bindir}/mcs1
 %mono_bin mozroots
 %mono_bin mconfig
 %mono_bin setreg
@@ -343,15 +358,11 @@
 %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
+%{monodir}/2.0/System.Xml.Linq.dll
 %{_bindir}/mkbundle2
 %{_libdir}/libmono.so.*
-%{_libdir}/libMonoPosixHelper.so
-%{_libdir}/libMonoSupportW.so
+%{_libdir}/libmono-profiler-logging.so.*
 %{_mandir}/man1/certmgr.1.gz
 %{_mandir}/man1/chktrust.1.gz
 %{_mandir}/man1/gacutil.1.gz
@@ -365,10 +376,10 @@
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/mconfig.1.gz
 %{_mandir}/man5/mono-config.5.gz
+%{_libdir}/libMonoPosixHelper.so
 %dir %{monodir}
 %dir %{monodir}/1.0
 %dir %{monodir}/2.0
-%dir %{monodir}/2.1
 %dir %{monodir}/3.5
 %dir %{monodir}/gac
 %dir %{monodir}/compat-*
@@ -382,7 +393,6 @@
 %gac_dll Mono.Cairo
 %{monodir}/gac/Mono.Cecil
 %{monodir}/gac/Mono.Cecil.Mdb
-%gac_dll Mono.Mozilla
 %gac_dll Mono.CompilerServices.SymbolWriter
 %gac_dll Mono.GetOptions
 %gac_dll Mono.Posix
@@ -396,20 +406,19 @@
 %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
 %dir %{_sysconfdir}/mono/1.0
 %dir %{_sysconfdir}/mono/2.0
+%dir %{_sysconfdir}/mono/mconfig
 %config (noreplace) %{_sysconfdir}/mono/config
 %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
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -417,25 +426,32 @@
 %{_bindir}/pedump
 %mono_bin_1 al al
 %mono_bin_2 al2 al
+%{_bindir}/al1
 %mono_bin caspol
 %mono_bin cert2spc
 %mono_bin cilc
 %mono_bin dtd2xsd
 %mono_bin dtd2rng
-%mono_bin genxs
+%mono_bin_1 genxs1 genxs
+%{_bindir}/genxs
+%{_bindir}/genxs2
 %mono_bin sgen
 %mono_bin_1 ilasm ilasm
+%{_bindir}/ilasm1
 %mono_bin_2 ilasm2 ilasm
 %mono_bin macpack
 %mono_bin makecert
 %mono_bin mkbundle
+%{_bindir}/mkbundle1
 %mono_bin_1 monop monop
+%{_bindir}/monop1
 %mono_bin_2 monop2 monop
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
 %mono_bin permview
 %mono_bin prj2make
 %mono_bin_1 resgen resgen
+%{_bindir}/resgen1
 %mono_bin_2 resgen2 resgen
 %mono_bin secutil
 %mono_bin signcode
@@ -475,10 +491,14 @@
 %{_libdir}/libmono-profiler-aot.*
 %{_libdir}/libmono-profiler-cov.*
 %{_libdir}/libmono.so
+%{_libdir}/libMonoSupportW.so
+%{_libdir}/libmono-profiler-logging.so
+%{_libdir}/libikvm-native.so
 %{_libdir}/pkgconfig/dotnet.pc
 %{_libdir}/pkgconfig/mono-cairo.pc
 %{_libdir}/pkgconfig/mono.pc
 %{_libdir}/pkgconfig/cecil.pc
+%{_libdir}/pkgconfig/dotnet35.pc
 %{_includedir}/mono-1.0
 %{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
 %dir %{_datadir}/mono-1.0
@@ -535,6 +555,7 @@
 %defattr(-,root,root,-)
 %gac_dll Mono.Http
 %gac_dll Mono.Web
+%gac_dll Mono.WebBrowser
 %gac_dll System.Runtime.Remoting
 %gac_dll System.Web
 %gac_dll System.Runtime.Serialization.Formatters.Soap
@@ -544,13 +565,16 @@
 %mono_bin disco
 %mono_bin soapsuds
 %mono_bin_1 wsdl wsdl
+%{_bindir}/wsdl1
 %mono_bin_2 wsdl2 wsdl
-%mono_bin xsd
+%mono_bin_2 xsd2 xsd
+%mono_bin_1 xsd xsd
 %{_mandir}/man1/disco.1.gz
 %{_mandir}/man1/soapsuds.1.gz
 %{_mandir}/man1/wsdl.1.gz
 %{_mandir}/man1/xsd.1.gz
 %config (noreplace) %{_sysconfdir}/mono/browscap.ini
+%config (noreplace) %{_sysconfdir}/mono/2.0/Browsers/Compat.browser
 %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx
 %config (noreplace) %{_sysconfdir}/mono/2.0/web.config
@@ -562,6 +586,8 @@
 %mono_bin sqlsharp
 %{_mandir}/man1/sqlsharp.1.gz
 %gac_dll System.Data
+%gac_dll System.Data.DataSetExtensions
+%gac_dll System.Data.Linq
 %gac_dll Mono.Data
 %gac_dll Mono.Data.Tds
 %gac_dll Mono.Data.TdsClient
@@ -600,11 +626,67 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
-* Sat Oct 11 2008 Dennis Gilmore <dennis at ausil.us> 1.9.1-3
-- change sparc to sparcv9
+* Sun Nov 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.13
+- Add in mono-api-diff and mono-api-info
+
+* Fri Oct 24 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0.12
+- Update to 2.0.1
+- remove selinux patch
+- remove s390 disable
+
+* Tue Oct 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-11.2
+- fixed no ownership of etc-mono-mconfig directory
+
+* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-11.1
+- fix the last fix...
+
+* Thu Oct 16 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-11
+- correct libdir in mono-cairo.pc file (BZ 467294)
+
+* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-10
+- bump to RC4
+
+* Sun Sep 28 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-9
+- backported binaryserialisation and datatable patches
+- backported stringreplace optimisation
+- bump to RC3
+
+* Thu Sep 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-8
+- MimeIcon patch added
+
+* Wed Sep 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
+- TableLayoutSettings fix (bz 462005)
+
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
+- Bump to RC1
+- Removed XIM patch
+- Added additional configure options
+- Fixed spec file
+
+* Fri Aug 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
+- moved libMonoPosixHelper back to the main package
+
+* Fri Aug 22 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
+- fix for XIM with en_GB.UTF locale plus others
+
+* Mon Aug 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- removed canna-devel requirements
+- bump to preview 2
+- removed further bits for moonlight
+
+* Sun Aug 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- added Canna-devel BR and R Canna for mwf
+- removed the build of moonlight parts
+- disable-static on configure
+
+* Sat Aug 02 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
+- bump to 2.0 preview 1
+- alter licence to MIT only
+- renamed and clean up patch files
+- spec file fixes
 
-* Wed Apr 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.9.1-2
-- fix libdir in pc files
+* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-2
+- pc file fixes
 
 * Tue Apr 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-1
 - bump to new beta


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-9/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	16 Apr 2008 21:16:44 -0000	1.21
+++ sources	2 Nov 2008 21:06:17 -0000	1.22
@@ -1 +1 @@
-8ef33f12749695124b4b7cd40fbb7da7  mono-1.9.1.tar.bz2
+60ab4d1d1990826578891e90cd560fa0  mono-2.0.1.tar.bz2


--- mono-1.1.13.4-ppc-threading.patch DELETED ---


--- mono-1.1.13.4-selinux-ia64.patch DELETED ---


--- mono-1.2.4-metadata.patch DELETED ---


--- mono-1251-metadata.patch DELETED ---


