From 74f6b038dead134f42f3ed4035d82916e1933abe Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Aug 26 2008 23:17:30 +0000
Subject: More fixes and actually remember to apply them!


---

diff --git a/import.log b/import.log
index 15da921..d38064c 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 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
+mono-debugger-2_0-5_fc10:HEAD:mono-debugger-2.0-5.fc10.src.rpm:1219792595
diff --git a/md-2.0-buildmakefile.patch b/md-2.0-buildmakefile.patch
new file mode 100644
index 0000000..2ded477
--- /dev/null
+++ b/md-2.0-buildmakefile.patch
@@ -0,0 +1,20 @@
+--- mono-debugger-2.0/build/Makefile.in	2008-07-31 20:08:54.000000000 +0100
++++ mono-debugger-2.0/build/Makefile-new.in	2008-08-27 00:08:58.000000000 +0100
+@@ -202,7 +202,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-twodir = $(prefix)/lib/mono/2.0
++twodir = @libdir@/mono/2.0
+ bin_SCRIPTS = mdb
+ two_SCRIPTS = mdb.exe mdb-symbolreader.exe
+ MCS_FLAGS = -debug -define:DEBUG -nowarn:0169,0067 $(am__append_1) \
+@@ -302,7 +302,7 @@
+ EXTRA_DIST = \
+ 	mdb.in runtests.in mono.snk AssemblyInfo.cs.in Mono.Debugger.dll.config.in
+ 
+-NUNIT_CONSOLE_EXE = $(NUNIT_PREFIX)/lib/mono/2.0/nunit-console.exe
++NUNIT_CONSOLE_EXE = @libdir@/mono/2.0/nunit-console.exe
+ NUNIT_CONSOLE_FLAGS = 
+ all: all-am
+ 
diff --git a/md-2.0-gacutil.patch b/md-2.0-gacutil.patch
index 7b6620a..f3d0451 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)@libdir@
++   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir @libdir@ /root $(DESTDIR)/usr/lib
     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 b92e514..f95a09c 100644
--- a/mono-debugger.spec
+++ b/mono-debugger.spec
@@ -1,7 +1,7 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
@@ -9,6 +9,7 @@ Source0: http://www.go-mono.com/sources-stable/%{name}/%{name}-%{version}.tar.bz
 Patch0: mono-debugger-2.0-use-system-cecil.patch
 Patch1: md-2.0-gacutil.patch
 Patch2: monodebug-configure.patch
+Patch3: md-2.0-buildmakefile.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.0 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake
@@ -40,9 +41,13 @@ rm -rf build/*.dll
 # bit of sed magic...
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH2}
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH3}
 %patch1 -p1 -b .original
+%patch2 -p1 -b .configure
+%patch3 -p1 -b .libdir
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH2}
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH3}
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -80,6 +85,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Wed Aug 27 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-5
+- more patches and actually apply the damned things
+
 * Tue Aug 26 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.0-4
 - libdir fixes
 
diff --git a/monodebug-configure.patch b/monodebug-configure.patch
index 15f0b12..a26533a 100644
--- a/monodebug-configure.patch
+++ b/monodebug-configure.patch
@@ -10,18 +10,6 @@
  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 @@
@@ -37,11 +25,3 @@
 -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
-