From dfbb4a78ab65978558cd03f6b10f72442b8332db Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Aug 26 2008 22:55:02 +0000
Subject: Bump to 2.0 preview 1 libdir fixes


---

diff --git a/import.log b/import.log
index 4e62a12..15da921 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 mono-debugger-2_0-3_fc10:HEAD:mono-debugger-2.0-3.fc10.src.rpm:1219752908
+mono-debugger-2_0-4_fc10:HEAD:mono-debugger-2.0-4.fc10.src.rpm:1219791256
diff --git a/md-2.0-gacutil.patch b/md-2.0-gacutil.patch
index 8002f5a..7b6620a 100644
--- a/md-2.0-gacutil.patch
+++ b/md-2.0-gacutil.patch
@@ -5,7 +5,7 @@
     AC_SUBST(WRAPPER_LIBS)
  
 -   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
-+   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $@libdir@ /root $(DESTDIR)$/usr/lib'
++   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir @libdir@ /root $(DESTDIR)@libdir@
     AC_PATH_PROG(GACUTIL, gacutil, no)
     if test "x$GACUTIL" = "xno" ; then
        AC_MSG_ERROR([No gacutil tool found])
diff --git a/mono-debugger.spec b/mono-debugger.spec
index 42b33df..b92e514 100644
--- a/mono-debugger.spec
+++ b/mono-debugger.spec
@@ -1,13 +1,14 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: http://www.go-mono.com/sources-stable/%{name}/%{name}-%{version}.tar.bz2
 Patch0: mono-debugger-2.0-use-system-cecil.patch
 Patch1: md-2.0-gacutil.patch
+Patch2: monodebug-configure.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.0 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake
@@ -38,8 +39,10 @@ rm -rf build/*.dll
 %patch0 -p1 -b .use-system-cecil
 # bit of sed magic...
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH2}
 %patch1 -p1 -b .original
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH2}
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -77,6 +80,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Tue Aug 26 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-4
+- libdir fixes
+
 * Sun Aug 17 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-3
 - paul learns how to count...
 - spec fixes
diff --git a/monodebug-configure.patch b/monodebug-configure.patch
new file mode 100644
index 0000000..15f0b12
--- /dev/null
+++ b/monodebug-configure.patch
@@ -0,0 +1,47 @@
+--- mono-debugger-0.30/configure.in	2006-07-18 17:59:13.000000000 +0100
++++ mono-debugger-0.30/configure.in	2006-08-27 10:33:30.000000000 +0100
+@@ -104,7 +104,7 @@
+ # not 64 bit clean in cross-compile
+ AC_CHECK_SIZEOF(void *, 4)
+ 
+-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
++CFLAGS="-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings $CFLAGS"
+ 
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ if test "x$PKG_CONFIG" = "xno"; then
+
+--- mono-debugger-0.30/configure.in	2006-07-18 17:59:13.000000000 +0100
++++ mono-debugger-0.30/configure.in	2006-08-27 10:33:30.000000000 +0100
+@@ -217,7 +217,7 @@
+ CHECK_READLINE
+ 
+ AC_MSG_CHECKING([Whether your Mono is working])
+-old_CFLAGS=$cflags
++old_CFLAGS=$CFLAGS
+ CFLAGS=$WRAPPER_CFLAGS
+ AC_TRY_COMPILE([#include <mono/metadata/mono-debug.h>
+ ], [
+
+--- mono-debugger-0.30/mono-debugger.pc.in	2006-07-18 17:59:13.000000000 +0100
++++ mono-debugger-0.30/mono-debugger.pc.in	2006-08-27 10:35:11.000000000 +0100
+@@ -1,9 +1,9 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ 
+ 
+ Name: Mono.Debugger
+ Description: Debugging API for Mono
+ Version: @VERSION@
+-Libs: -r:${prefix}/lib/mono/mono-debugger/Mono.Debugger.dll
++Libs: -r:@libdir@/mono/mono-debugger/Mono.Debugger.dll
+
+--- mono-debugger-0.30/build/Makefile.am	2006-07-18 17:59:12.000000000 +0100
++++ mono-debugger-0.30/build/Makefile.am	2006-08-27 10:58:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-onedir = $(prefix)/lib/mono/1.0
++onedir = @libdir@/mono/1.0
+ 
+ bin_SCRIPTS = mdb
+