From b883e3bd65329e1a742ef7f690a3240884111bb5 Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Jan 18 2009 23:17:02 +0000
Subject: Remove redundant patches Use sed to fix lib64 problem


---

diff --git a/import.log b/import.log
index cde335f..a70f1b6 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ mono-debugger-2_2-1_pre1_fc10:HEAD:mono-debugger-2.2-1.pre1.fc10.src.rpm:1227710
 mono-debugger-2_2-3_RC2_20090109svn122605_fc11:HEAD:mono-debugger-2.2-3.RC2.20090109svn122605.fc11.src.rpm:1231634063
 mono-debugger-2_4-1_20090116svn123514_fc11:HEAD:mono-debugger-2.4-1.20090116svn123514.fc11.src.rpm:1232150631
 mono-debugger-2_4-2_20090116svn123514_fc11:HEAD:mono-debugger-2.4-2.20090116svn123514.fc11.src.rpm:1232220493
+mono-debugger-2_4-3_20090116svn123514_fc11:HEAD:mono-debugger-2.4-3.20090116svn123514.fc11.src.rpm:1232320566
diff --git a/mono-debugger.spec b/mono-debugger.spec
index 10b84fb..e4a2279 100644
--- a/mono-debugger.spec
+++ b/mono-debugger.spec
@@ -3,13 +3,11 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.4
-Release: 2.20090116svn%{svnver}%{?dist}
+Release: 3.20090116svn%{svnver}%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: %{name}-%{svnver}.tar.bz2
-Patch0: monodebugger-2.2-configure.patch
-Patch1: monodebugger-2.2-makefiles.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.2 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake xsp-devel
@@ -37,22 +35,14 @@ Development package for mono-debugger
 %prep
 %setup -q -n %{name}-%{svnver}
 rm -rf build/*.dll
-# bit of sed magic... - let's see if this works
-#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
-#sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
-#%patch0 -p1 -b .configure
-#%patch1 -p1 -b .makefiles
-#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
-#sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
-
-find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+
+find . -name \*.in -or -name \*.am -or -name \*.pc.in \
        | while read f ;
          do
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
            sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
          done
 
-sed -i -e 's!$(prefix)/lib!%{_libdir}!' configure.in
 sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
 
@@ -94,6 +84,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sat Jan 17 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.4-3.20090116svn123514
+- Try another approach for fixing configure.in
+- Removed redundant patches
+
 * Sat Jan 17 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> 2.4-2.20090116svn123514
 - Fix lib64 issue in configure.in
 
diff --git a/monodebugger-2.2-configure.patch b/monodebugger-2.2-configure.patch
deleted file mode 100644
index 7e771b0..0000000
--- a/monodebugger-2.2-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- mono-debugger-2.2/configure.in	2008-11-17 16:45:58.000000000 +0000
-+++ mono-debugger-2.2/configure-new.in	2008-11-26 12:15:58.000000000 +0000
-@@ -163,7 +163,7 @@
-    AC_SUBST(WRAPPER_CFLAGS)
-    AC_SUBST(WRAPPER_LIBS)
- 
--   GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/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])
---- mono-debugger-2.2/mono-debugger.pc.in	2008-08-12 17:19:50.000000000 +0100
-+++ mono-debugger-2.2/mono-debugger.pc-new.in	2008-11-26 12:16:26.000000000 +0000
-@@ -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
diff --git a/monodebugger-2.2-makefiles.patch b/monodebugger-2.2-makefiles.patch
deleted file mode 100644
index 58fb786..0000000
--- a/monodebugger-2.2-makefiles.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mono-debugger-2.2/build/Makefile.am	2008-11-13 23:09:27.000000000 +0000
-+++ mono-debugger-2.2/build/Makefile-new.am	2008-11-26 12:19:57.000000000 +0000
-@@ -1,4 +1,4 @@
--twodir = $(prefix)/lib/mono/2.0
-+twodir = $(libdir)/mono/2.0
- 
- bin_SCRIPTS = mdb
- 
---- mono-debugger-2.2/doc/Makefile.am	2008-08-12 17:19:48.000000000 +0100
-+++ mono-debugger-2.2/doc/Makefile-new.am	2008-11-26 12:21:07.000000000 +0000
-@@ -1,15 +1,15 @@
- EXTRA_DIST = FAQ.txt \
- 	     symbol-lookups.txt debugger.source
- 
--sourcesdir = @mono_prefix@/lib/monodoc/sources
-+sourcesdir = $(libdir)/monodoc/sources
- 
- sources_DATA = debugger.tree debugger.zip debugger.source
- 
- debugger.tree debugger.zip: $(srcdir)/api/*/*.xml
--	mono --debug @monodoc_prefix@/lib/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
-+	mono --debug $(libdir)/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
- 
- update:
--	monodocer -assembly:@prefix@/lib/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
-+	monodocer -assembly:$(libdir)/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
- 
- dist-hook:
- 	find . -name '*.xml' > files