rpms/mono-debugger/devel import.log, NONE, 1.1 md-2.0-gacutil.patch, NONE, 1.1 mono-debugger-2.0-use-system-cecil.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 mono-debugger.spec, 1.13, 1.14 sources, 1.5, 1.6 mono-debugger-0.60-noasmuser.patch, 1.1, NONE mono-debugger-0.60-use-system-cecil.patch, 1.1, NONE monodebug-configure.patch, 1.2, NONE

Tue Aug 26 12:16:27 UTC 2008

Author: pfj

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

Modified Files:
	.cvsignore mono-debugger.spec sources 
Added Files:
	import.log md-2.0-gacutil.patch 
	mono-debugger-2.0-use-system-cecil.patch 
Removed Files:
	mono-debugger-0.60-noasmuser.patch 
	mono-debugger-0.60-use-system-cecil.patch 
	monodebug-configure.patch 
Log Message:

Bump to 2.0
Lots of changes to patch files as things are more sane by now

--- NEW FILE import.log ---
mono-debugger-2_0-3_fc10:HEAD:mono-debugger-2.0-3.fc10.src.rpm:1219752908

md-2.0-gacutil.patch:

--- NEW FILE md-2.0-gacutil.patch ---
--- mono-debugger-2.0/configure.in	2008-07-31 20:08:36.000000000 +0100
+++ mono-debugger-2.0/configure-new.in	2008-08-14 17:51:56.000000000 +0100
@@ -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)$/usr/lib'
    AC_PATH_PROG(GACUTIL, gacutil, no)
    if test "x$GACUTIL" = "xno" ; then
       AC_MSG_ERROR([No gacutil tool found])

mono-debugger-2.0-use-system-cecil.patch:

--- NEW FILE mono-debugger-2.0-use-system-cecil.patch ---
--- mono-debugger-2.0/build/Makefile.am	2008-07-31 20:08:36.000000000 +0100
+++ mono-debugger-2.0/build/Makefile-new.am	2008-08-05 20:42:51.000000000 +0100
@@ -1,4 +1,4 @@
-twodir = $(prefix)/lib/mono/2.0
+twodir = $(libdir)/mono/2.0
 
 bin_SCRIPTS = mdb
 
@@ -76,17 +76,17 @@
 
 SYMBOL_WRITER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 SYMBOL_READER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 DEBUGGER_DEPS = \
 	-r:Mono.GetOptions				\
 	-r:Mono.Debugger.SymbolWriter			\
 	-r:System.Runtime.Serialization.Formatters.Soap	\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 MDB_DEPS = \
 	-r:Mono.GetOptions				\
@@ -94,16 +94,13 @@
 
 TEST_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:./Mono.Debugger.dll				\
-	-r:./Mono.Debugger.Frontend.dll			\
-	-r:nunit.framework				\
 	-r:nunit.core
 
 if MARTIN_PRIVATE
 MCS_FLAGS += -define:MARTIN_PRIVATE
 endif
 
-Mono.Debugger.SymbolWriter.dll: Makefile Mono.Cecil.dll $(SYMBOL_WRITER_SRCLIST)
+Mono.Debugger.SymbolWriter.dll: Makefile $(srcdir)/Mono.Cecil.dll $(SYMBOL_WRITER_SRCLIST)
 	$(MCS) -target:library -out:Mono.Debugger.SymbolWriter.dll -d:CECIL $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(SYMBOL_WRITER_DEPS) $(SYMBOL_WRITER_SRCLIST)
 
 Mono.Debugger.dll: Makefile Mono.Debugger.SymbolWriter.dll $(DEBUGGER_SRCLIST)
@@ -151,7 +148,7 @@
 		< $(srcdir)/mdb.in > mdb.tmp \
 	&& mv mdb.tmp mdb 
 
-NUNIT_CONSOLE_EXE = $(NUNIT_PREFIX)/lib/mono/2.0/nunit-console.exe
+NUNIT_CONSOLE_EXE = $(libdir)/mono/2.0/nunit-console.exe
 
 runtests: runtests.in Makefile
 	builddir=$(top_builddir) ; the_builddir=`cd $$builddir && pwd` ; \
--- 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-05 20:46:13.000000000 +0100
@@ -270,17 +270,17 @@
 
 SYMBOL_WRITER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 SYMBOL_READER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 DEBUGGER_DEPS = \
 	-r:Mono.GetOptions				\
 	-r:Mono.Debugger.SymbolWriter			\
 	-r:System.Runtime.Serialization.Formatters.Soap	\
-	-r:./Mono.Cecil.dll
+	-r:$(srcdir)/Mono.Cecil.dll
 
 MDB_DEPS = \
 	-r:Mono.GetOptions				\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2007 00:25:57 -0000	1.5
+++ .cvsignore	26 Aug 2008 12:15:56 -0000	1.6
@@ -1 +1 @@
-mono-debugger-0.60.tar.bz2
+mono-debugger-2.0.tar.bz2


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mono-debugger.spec	11 Apr 2008 21:12:42 -0000	1.13
+++ mono-debugger.spec	26 Aug 2008 12:15:56 -0000	1.14
@@ -1,18 +1,17 @@
 Summary: A debugger for Mono
 Name: mono-debugger
-Version: 0.60
+Version: 2.0
 Release: 3%{?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: monodebug-configure.patch
-Patch1: mono-debugger-0.60-noasmuser.patch
-Patch2: mono-debugger-0.60-use-system-cecil.patch
+Patch0: mono-debugger-2.0-use-system-cecil.patch
+Patch1: md-2.0-gacutil.patch
 BuildRequires: readline-devel ncurses-devel libtool
-BuildRequires: mono-devel mono-nunit
+BuildRequires: mono-devel >= 2.0 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake
-Requires: mono-core >= 1.2.6
+Requires: mono-core >= 2.0
 Group: Development/Tools
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -35,11 +34,13 @@
 
 %prep
 %setup -q
-%patch0 -p1
-autoreconf
-%patch1 -p1
 rm -rf build/*.dll
-%patch2 -p1
+%patch0 -p1 -b .use-system-cecil
+# bit of sed magic...
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH1}
+%patch1 -p1 -b .original
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH1}
+
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
 cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
@@ -62,21 +63,32 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog README README.FreeBSD TODO NEWS RELEASE-NOTES*
+%defattr(-, root, root,-)
+%doc AUTHORS COPYING ChangeLog README
 %{_bindir}/mdb
 %{_libdir}/*.so*
-%{_libdir}/mono/1.0/*.exe
-%{_libdir}/mono/mono-debugger/
+%{_libdir}/mono/2.0/mdb*
 %{_libdir}/mono/gac/Mono.Debugger/
-%{_libdir}/mono/gac/Mono.Debugger.Backend/
+%{_libdir}/mono/gac/Mono.Debugger.SymbolWriter/
+%{_libdir}/mono/mono-debugger/
 
 %files devel
-%defattr(-,root,root)
-%doc README.build
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/mono-debugger.pc
 
 %changelog
+* Sun Aug 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- paul learns how to count...
+- spec fixes
+
+* Thu Aug 14 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- libdir clean
+- spec file fix
+
+*  Sun Aug 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
+- bump to preview 1
+- patch fixes
+
 * Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.60-3
 - fix compile
 - use system Cecil, not prebundled binary Cecil


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2007 00:25:57 -0000	1.5
+++ sources	26 Aug 2008 12:15:56 -0000	1.6
@@ -1 +1 @@
-5d13af893299af49ad6abf2d76a35df6  mono-debugger-0.60.tar.bz2
+062c8051cce0b32d32a08f5059e884b0  mono-debugger-2.0.tar.bz2


--- mono-debugger-0.60-noasmuser.patch DELETED ---


--- mono-debugger-0.60-use-system-cecil.patch DELETED ---


--- monodebug-configure.patch DELETED ---


