rpms/mono/devel import.log, 1.8, 1.9 mono-2.0-pcfiles.patch, 1.2, 1.3 mono.spec, 1.82, 1.83

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log mono-2.0-pcfiles.patch mono.spec 
Log Message:

Fix the last fix and rebuild 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	16 Oct 2008 22:16:52 -0000	1.8
+++ import.log	18 Oct 2008 23:36:22 -0000	1.9
@@ -6,3 +6,4 @@
 mono-2_0-8_fc10:HEAD:mono-2.0-8.fc10.src.rpm:1221814700
 mono-2_0-10_fc10:HEAD:mono-2.0-10.fc10.src.rpm:1222991530
 mono-2_0-11_fc10:HEAD:mono-2.0-11.fc10.src.rpm:1224195347
+mono-2_0-11_1_fc10:HEAD:mono-2.0-11.1.fc10.src.rpm:1224372920

mono-2.0-pcfiles.patch:

Index: mono-2.0-pcfiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-2.0-pcfiles.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-2.0-pcfiles.patch	16 Oct 2008 22:16:52 -0000	1.2
+++ mono-2.0-pcfiles.patch	18 Oct 2008 23:36:22 -0000	1.3
@@ -22,14 +22,14 @@
  prefix=${pcfiledir}/../..
  exec_prefix=${pcfiledir}/../..
 -libdir=${prefix}/@reloc_libdir@
-+libdir=${libdir}
++libdir=@libdir@
  includedir=${prefix}/include
  
  Name: Mono.Cairo
  Description: Cairo bindings for Mono
  Version: @VERSION@
 -Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
-+Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll
++Libs: -r:@libdir@/mono/1.0/Mono.Cairo.dll
 --- mono-2.0/data/mono.pc.in	2008-07-01 18:51:07.000000000 +0100
 +++ mono-2.0/data/mono.pc-new.in	2008-08-03 15:59:18.000000000 +0100
 @@ -1,6 +1,6 @@


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mono.spec	16 Oct 2008 22:16:52 -0000	1.82
+++ mono.spec	18 Oct 2008 23:36:22 -0000	1.83
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.0
-Release:        11%{?dist}
+Release:        11.1%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -261,7 +261,9 @@
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .use-monodir
 %patch6 -p1 -b .use-libdir
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .pc-patches
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
 %patch11 -p1 -b .tablelayout
@@ -623,6 +625,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-11.1
+- fix the last fix...
+
 * Thu Oct 16 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-11
 - correct libdir in mono-cairo.pc file (BZ 467294)