From 414a753d3e3ded301629a5f6a7ee83ab79ae2d3c Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Oct 18 2008 23:36:22 +0000
Subject: Fix the last fix and rebuild


---

diff --git a/import.log b/import.log
index dc1f0de..6304c58 100644
--- a/import.log
+++ b/import.log
@@ -6,3 +6,4 @@ mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120
 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
diff --git a/mono-2.0-pcfiles.patch b/mono-2.0-pcfiles.patch
index 79e207e..dd256ee 100644
--- a/mono-2.0-pcfiles.patch
+++ b/mono-2.0-pcfiles.patch
@@ -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 @@
diff --git a/mono.spec b/mono.spec
index 7c31864..2a3137b 100644
--- a/mono.spec
+++ b/mono.spec
@@ -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 @@ sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
 %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 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Sat Oct 18 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-11.1
+- fix the last fix...
+
 * Thu Oct 16 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-11
 - correct libdir in mono-cairo.pc file (BZ 467294)