Update to 2.4.2 preview 2 Fix libgdiplusconfig patch

This commit is contained in:
Paul F. Johnson 2009-06-17 22:49:24 +00:00
parent 7bc52b119a
commit ee98cff55e
5 changed files with 20 additions and 13 deletions

@ -46,3 +46,4 @@ mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc11.src.rpm:1239097233
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

@ -1,10 +0,0 @@
--- mono-2.2/data/config.in 2008-11-30 19:34:24.000000000 +0000
+++ mono-2.2/data/config-new.in 2008-12-02 23:57:51.000000000 +0000
@@ -15,6 +15,7 @@
<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="gdiplus.dll" target="libgdiplus.so.0" os="linux"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="i:kernel32.dll">

@ -0,0 +1,12 @@
--- 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">

@ -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@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@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)

@ -1 +1 @@
7bf251e22a4d0edc08a9a49cf5d4c5c7 mono-2.4.2.tar.bz2
29691e620122993256cca7b9fcb0e9ae mono-2.4.2.tar.bz2