rpms/mono/devel import.log, 1.20, 1.21 mono-22-libgdiwinform.patch, 1.1, 1.2 mono.spec, 1.93, 1.94 sources, 1.28, 1.29

[Paul F. Johnson]

Author: pfj

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

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

More sed fixes 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	3 Dec 2008 23:47:21 -0000	1.20
+++ import.log	9 Dec 2008 09:59:18 -0000	1.21
@@ -18,3 +18,4 @@
 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
+mono-2_2-8_pre2_fc11:HEAD:mono-2.2-8.pre2.fc11.src.rpm:1228759110

mono-22-libgdiwinform.patch:

Index: mono-22-libgdiwinform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-22-libgdiwinform.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-22-libgdiwinform.patch	3 Dec 2008 23:47:22 -0000	1.1
+++ mono-22-libgdiwinform.patch	9 Dec 2008 09:59:18 -0000	1.2
@@ -4,7 +4,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="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="i:kernel32.dll">


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mono.spec	3 Dec 2008 23:47:22 -0000	1.93
+++ mono.spec	9 Dec 2008 09:59:19 -0000	1.94
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.2
-Release:        7.pre1%{?dist}
+Release:        8.pre2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -274,23 +274,19 @@
 %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 \
+find . -name Makefile.am -or -name \*.pc.in \
        -or -name \*.in -or -name \*.make \
        | while read f ;
          do
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
-           sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
-           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";
+           sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' "$f" 
+           sed -i -e 's!@prefix@/lib/!%{_libdir}/!' "$f"
+           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
@@ -689,6 +685,10 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Dec 05 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-8.pre2
+- Bump to 2.2 preview 2
+- More sed fixes
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	25 Nov 2008 15:44:43 -0000	1.28
+++ sources	9 Dec 2008 09:59:19 -0000	1.29
@@ -1 +1 @@
-4f3c266fde3cbf47f4d3c1e201faa3ef  mono-2.2.tar.bz2
+a311545a0003f1a599297d57e4e27916  mono-2.2.tar.bz2