rpms/mono-debugger/devel md-2.0-buildmakefile.patch, NONE, 1.1 import.log, 1.2, 1.3 md-2.0-gacutil.patch, 1.2, 1.3 mono-debugger.spec, 1.15, 1.16 monodebug-configure.patch, 1.4, 1.5

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log md-2.0-gacutil.patch mono-debugger.spec 
	monodebug-configure.patch 
Added Files:
	md-2.0-buildmakefile.patch 
Log Message:

More fixes and actually remember to apply them! 


md-2.0-buildmakefile.patch:

--- NEW FILE md-2.0-buildmakefile.patch ---
--- 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
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Aug 2008 22:55:02 -0000	1.2
+++ import.log	26 Aug 2008 23:17:30 -0000	1.3
@@ -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

md-2.0-gacutil.patch:

Index: md-2.0-gacutil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/md-2.0-gacutil.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- md-2.0-gacutil.patch	26 Aug 2008 22:55:02 -0000	1.2
+++ md-2.0-gacutil.patch	26 Aug 2008 23:17:30 -0000	1.3
@@ -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])


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mono-debugger.spec	26 Aug 2008 22:55:02 -0000	1.15
+++ mono-debugger.spec	26 Aug 2008 23:17:30 -0000	1.16
@@ -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 @@
 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 @@
 # 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 @@
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Wed Aug 27 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
+- more patches and actually apply the damned things
+
 * Tue Aug 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
 - libdir fixes
 

monodebug-configure.patch:

Index: monodebug-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/monodebug-configure.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monodebug-configure.patch	26 Aug 2008 22:55:02 -0000	1.4
+++ monodebug-configure.patch	26 Aug 2008 23:17:30 -0000	1.5
@@ -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
-