rpms/mono/devel mono-22-libgdiwinform.patch, NONE, 1.1 import.log, 1.19, 1.20 mono.spec, 1.92, 1.93

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log mono.spec 
Added Files:
	mono-22-libgdiwinform.patch 
Log Message:

Added patch for winforms not to need libgdiplus-devel
Added patch for winforms class
Added an extras sed invocation 


mono-22-libgdiwinform.patch:

--- NEW FILE mono-22-libgdiwinform.patch ---
--- 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" so="!windows"/>
 	<dllmap dll="libX11" target="@X11@" os="!windows" />
 	<dllmap dll="libcairo-2.dll" target="libcairo.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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- import.log	30 Nov 2008 19:58:12 -0000	1.19
+++ import.log	3 Dec 2008 23:47:21 -0000	1.20
@@ -17,3 +17,4 @@
 mono-2_2-4_pre1_fc10:HEAD:mono-2.2-4.pre1.fc10.src.rpm:1227705354
 mono-2_2-5_pre1_fc11:HEAD:mono-2.2-5.pre1.fc11.src.rpm:1228072254
 mono-2_2-6_pre1_fc11:HEAD:mono-2.2-6.pre1.fc11.src.rpm:1228075040
+mono-2_2-7_pre1_fc11:HEAD:mono-2.2-7.pre1.fc11.src.rpm:1228347891


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mono.spec	30 Nov 2008 19:58:12 -0000	1.92
+++ mono.spec	3 Dec 2008 23:47:22 -0000	1.93
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.2
-Release:        6.pre1%{?dist}
+Release:        7.pre1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -42,6 +42,7 @@
 Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-2.2-winforms.patch
+Patch7: mono-22-libgdiwinform.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -131,7 +132,7 @@
 %package winforms
 Summary:        Windows Forms implementation for Mono
 Group:          Development/Languages
-Requires:       mono-core = %{version}-%{release}, libgdiplus-devel
+Requires:       mono-core = %{version}-%{release}
 
 %description winforms
 This package provides a fully managed implementation of
@@ -271,6 +272,9 @@
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
 %patch6 -p1 -b .winforms
+%patch7 -p1 -b .libgdiplus
+
+mv configure.in configure.ini
 
 find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
        -or -name \*.in -or -name \*.make \
@@ -281,9 +285,12 @@
            sed -i -e 's!/usr/lib!%{_libdir}!' "$f"
            sed -i -e 's!${prefix}/lib!%{_libdir}!' "$f"
            sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$(exec_prefix)/lib!%{_libdir}!' "$f"
            sed -i -e 's!${prefix}/@reloc_libdir@!%{_libdir}!' "$f";
          done
 
+mv configure.ini configure.in
+
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -682,6 +689,10 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Thu Dec 04 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-7.pre1
+- Add fix so that winforms doesn't need libgdiplus-devel
+- Add fix so the sed script works correctly on x86_64
+
 * Sun Nov 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-6.pre1
 - missed a sed invocation