diff --git a/import.log b/import.log index e784433..7755ce0 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ mono-2_0-1_fc10:HEAD:mono-2.0-1.fc10.src.rpm:1218719116 mono-2_0-4_fc10:HEAD:mono-2.0-4.fc10.src.rpm:1219746940 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677 mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246 +mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120 diff --git a/mono-2.0-tablelayout.patch b/mono-2.0-tablelayout.patch new file mode 100644 index 0000000..d3ea98a --- /dev/null +++ b/mono-2.0-tablelayout.patch @@ -0,0 +1,11 @@ +--- 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); diff --git a/mono.spec b/mono.spec index d9fac60..b90242b 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono Version: 2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -44,6 +44,7 @@ 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 %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -259,6 +260,7 @@ sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8} %patch7 -p1 -b .pc-patches %patch9 -p1 -b .monoservice %patch10 -p1 -b .metadata +%patch11 -p1 -b .tablelayout autoreconf -f -i -s # Add undeclared Arg @@ -613,6 +615,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll IBM.Data.DB2 %changelog +* Wed Sep 17 2008 Paul F. Johnson 2.0-7 +- TableLayoutSettings fix (bz 462005) + * Tue Sep 09 2008 Paul F. Johnson 2.0-6 - Bump to RC1 - Removed XIM patch