rpms/mono/devel mono-242-libgdiplusconfig.patch, NONE, 1.1 import.log, 1.48, 1.49 mono.spec, 1.132, 1.133 sources, 1.51, 1.52 mono-22-libgdiwinform.patch, 1.3, NONE

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32360/devel

Modified Files:
	import.log mono.spec sources 
Added Files:
	mono-242-libgdiplusconfig.patch 
Removed Files:
	mono-22-libgdiwinform.patch 
Log Message:

Update to 2.4.2 preview 2
Fix libgdiplusconfig patch 


mono-242-libgdiplusconfig.patch:

--- NEW FILE mono-242-libgdiplusconfig.patch ---
--- mono-2.4.2/data/config.in	2009-06-15 22:16:29.000000000 +0100
+++ mono-2.4.2/data/config-new.in	2009-06-17 22:57:56.000000000 +0100
@@ -15,7 +15,8 @@
 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
 	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
-	<dllmap dll="libX11" target="@X11@" os="!windows" />
+	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0" os="!windows"/>
+	<dllmap dll="libX11" target="@X11@" os="!windows"/>
 	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
 	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
 	<dllmap dll="i:kernel32.dll">


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- import.log	14 Jun 2009 16:48:02 -0000	1.48
+++ import.log	17 Jun 2009 22:49:23 -0000	1.49
@@ -46,3 +46,4 @@ mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc
 mono-2_4-13_2_fc11:HEAD:mono-2.4-13.2.fc11.src.rpm:1239456192
 mono-2_4_2-1_fc11:HEAD:mono-2.4.2-1.fc11.src.rpm:1244979134
 mono-2_4_2-2_fc12:HEAD:mono-2.4.2-2.fc12.src.rpm:1244998030
+mono-2_4_2-3_fc12:HEAD:mono-2.4.2-3.fc12.src.rpm:1245278907


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- mono.spec	14 Jun 2009 16:48:03 -0000	1.132
+++ mono.spec	17 Jun 2009 22:49:23 -0000	1.133
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        2.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -42,7 +42,7 @@ Patch2: mono-1.2.3-use-monodir.patch
 Patch3: mono-2.2-uselibdir.patch
 Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
-Patch6: mono-22-libgdiwinform.patch
+Patch6: mono-242-libgdiplusconfig.patch
 Patch7: mono-22-libdir.patch
 Patch8: mono-242-metadata-appconf.patch
 
@@ -720,6 +720,10 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Wed Jun 17 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-3
+- Bump to 2.4.2 preview 2
+- Fix libgdiplus winform patch
+
 * Sun Jun 14 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2-2
 - Fix metadata makefile (duplicates appconf.h during make install)
 - Move System.Web to mono-core (bz 434709)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources	14 Jun 2009 11:33:25 -0000	1.51
+++ sources	17 Jun 2009 22:49:24 -0000	1.52
@@ -1 +1 @@
-7bf251e22a4d0edc08a9a49cf5d4c5c7  mono-2.4.2.tar.bz2
+29691e620122993256cca7b9fcb0e9ae  mono-2.4.2.tar.bz2


--- mono-22-libgdiwinform.patch DELETED ---