rpms/mono-debugger/devel mdb-2.6-build.patch, NONE, 1.1 mdb-2.6-configure.patch, NONE, 1.1 mdb-2.6-doc.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 import.log, 1.13, 1.14 mono-debugger.spec, 1.28, 1.29 sources, 1.12, 1.13

Paul F. Johnson pfj at fedoraproject.org
Wed Dec 23 00:30:47 UTC 2009


Author: pfj

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

Modified Files:
	.cvsignore import.log mono-debugger.spec sources 
Added Files:
	mdb-2.6-build.patch mdb-2.6-configure.patch mdb-2.6-doc.patch 
Log Message:

Update to 2.6 release
Removed lots of sed magic and replaced with patches 


mdb-2.6-build.patch:
 Makefile-new.am |    2 +-
 Makefile-new.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mdb-2.6-build.patch ---
--- mono-debugger-2.6/build/Makefile.am	2009-11-09 12:27:09.000000000 +0000
+++ mono-debugger-2.6/build/Makefile-new.am	2009-12-22 22:38:13.000000000 +0000
@@ -1,4 +1,4 @@
-twodir = $(prefix)/lib/mono/2.0
+twodir = $(libdir)/mono/2.0
 
 bin_SCRIPTS = mdb mdb-symbolreader
 
--- mono-debugger-2.6/build/Makefile.in	2009-12-04 20:34:04.000000000 +0000
+++ mono-debugger-2.6/build/Makefile-new.in	2009-12-22 22:39:42.000000000 +0000
@@ -226,7 +226,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-twodir = $(prefix)/lib/mono/2.0
+twodir = @libdir@/mono/2.0
 bin_SCRIPTS = mdb mdb-symbolreader
 two_SCRIPTS = mdb.exe mdb-symbolreader.exe
 MCS_FLAGS = -debug -define:DEBUG -define:DEBUGGER_SOURCE \

mdb-2.6-configure.patch:
 configure-new.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdb-2.6-configure.patch ---
--- mono-debugger-2.6/configure.in	2009-09-25 16:19:09.000000000 +0100
+++ mono-debugger-2.6/configure-new.in	2009-12-22 22:26:52.000000000 +0000
@@ -164,7 +164,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])

mdb-2.6-doc.patch:
 Makefile-new.am |    6 +++---
 Makefile-new.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mdb-2.6-doc.patch ---
--- mono-debugger-2.6/doc/Makefile.am	2009-09-25 16:19:09.000000000 +0100
+++ mono-debugger-2.6/doc/Makefile-new.am	2009-12-22 22:43:19.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
--- mono-debugger-2.6/doc/Makefile.in	2009-12-04 20:34:04.000000000 +0000
+++ mono-debugger-2.6/doc/Makefile-new.in	2009-12-22 22:44:26.000000000 +0000
@@ -209,7 +209,7 @@
 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
 CLEANFILES = debugger.tree debugger.zip files
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	9 Jul 2009 22:23:28 -0000	1.12
+++ .cvsignore	23 Dec 2009 00:30:46 -0000	1.13
@@ -1 +1 @@
-mono-debugger-2.4.2.1.tar.bz2
+mono-debugger-2.6.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- import.log	9 Jul 2009 22:23:28 -0000	1.13
+++ import.log	23 Dec 2009 00:30:47 -0000	1.14
@@ -11,3 +11,4 @@ mono-debugger-2_4-7_RC3_fc11:HEAD:mono-d
 mono-debugger-2_4-8_fc11:HEAD:mono-debugger-2.4-8.fc11.src.rpm:1238109449
 mono-debugger-2_4_2-1_fc12:HEAD:mono-debugger-2.4.2-1.fc12.src.rpm:1245788313
 mono-debugger-2_4_2_1-1_fc12:HEAD:mono-debugger-2.4.2.1-1.fc12.src.rpm:1247178166
+mono-debugger-2_6-2_fc13:HEAD:mono-debugger-2.6-2.fc13.src.rpm:1261528169


Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mono-debugger.spec	25 Jul 2009 15:00:30 -0000	1.28
+++ mono-debugger.spec	23 Dec 2009 00:30:47 -0000	1.29
@@ -1,11 +1,14 @@
 Summary: A debugger for Mono
 Name: mono-debugger
-Version: 2.4.2.1
+Version: 2.6
 Release: 2%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: %{name}-%{version}.tar.bz2
+Patch0:	 mdb-2.6-configure.patch
+Patch1:	 mdb-2.6-build.patch
+Patch2:	 mdb-2.6-doc.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.4.2 mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake xsp-devel 
@@ -33,16 +36,19 @@ Development package for mono-debugger
 %prep
 %setup -q
 rm -rf build/*.dll
+%patch0 -p1 -b .config
+%patch1 -p1 -b .build
+%patch2 -p1 -b .doc
+
+#find . -name \*.in -or -name \*.am -or -name \*.pc.in \
+#       | while read f ;
+#         do
+#           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
+#           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!g' "$f" ;
+#         done
 
-find . -name \*.in -or -name \*.am -or -name \*.pc.in \
-       | while read f ;
-         do
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!g' "$f" 
-           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" ;
-         done
-
-sed -i -e 's!/usr/lib!%{_libdir}!' mono-debugger-frontend.pc.in
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!' mono-debugger-frontend.pc.in
+sed -i -e 's!/usr/lib!%{_libdir}!g' mono-debugger-frontend.pc.in
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger-frontend.pc.in
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
@@ -51,7 +57,8 @@ autoreconf -f -i -s
 
 %build
 %configure --disable-static --disable-dependency-tracking
-make %{?_smp_mflags}
+#%configure
+make 
 
 %install
 rm -rf %{buildroot}
@@ -83,8 +90,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Dec 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-2
+- Bump to 2.6 release
+
+* Sat Oct 03 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6-1
+- Bump to 2.6 preview 1
 
 * Thu Jul 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4.2.1-1
 - Bump to 2.4.2.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	9 Jul 2009 22:23:28 -0000	1.12
+++ sources	23 Dec 2009 00:30:47 -0000	1.13
@@ -1 +1 @@
-70bb41c52e39364416d3823c508b1a35  mono-debugger-2.4.2.1.tar.bz2
+a6cac2d8dc8f788a7b2b35cd3f7204dc  mono-debugger-2.6.tar.bz2




More information about the fedora-extras-commits mailing list