rpms/mono-debugger/devel monodebugger-2.2-configure.patch, NONE, 1.1 monodebugger-2.2-makefiles.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 import.log, 1.3, 1.4 mono-debugger.spec, 1.16, 1.17 sources, 1.6, 1.7 md-2.0-buildmakefile.patch, 1.1, NONE md-2.0-gacutil.patch, 1.3, NONE mono-debugger-2.0-use-system-cecil.patch, 1.1, NONE monodebug-configure.patch, 1.5, NONE
Paul F. Johnson
pfj at fedoraproject.org
Wed Nov 26 14:35:18 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/mono-debugger/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15046/devel
Modified Files:
.cvsignore import.log mono-debugger.spec sources
Added Files:
monodebugger-2.2-configure.patch
monodebugger-2.2-makefiles.patch
Removed Files:
md-2.0-buildmakefile.patch md-2.0-gacutil.patch
mono-debugger-2.0-use-system-cecil.patch
monodebug-configure.patch
Log Message:
Bump to 2.2 preview 1
Rationalise patch files
monodebugger-2.2-configure.patch:
--- NEW FILE monodebugger-2.2-configure.patch ---
--- 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
monodebugger-2.2-makefiles.patch:
--- NEW FILE monodebugger-2.2-makefiles.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 26 Aug 2008 12:15:56 -0000 1.6
+++ .cvsignore 26 Nov 2008 14:34:48 -0000 1.7
@@ -1 +1 @@
-mono-debugger-2.0.tar.bz2
+mono-debugger-2.2.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 26 Aug 2008 23:17:30 -0000 1.3
+++ import.log 26 Nov 2008 14:34:48 -0000 1.4
@@ -1,3 +1,4 @@
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
+mono-debugger-2_2-1_pre1_fc10:HEAD:mono-debugger-2.2-1.pre1.fc10.src.rpm:1227710038
Index: mono-debugger.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/mono-debugger.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mono-debugger.spec 26 Aug 2008 23:17:30 -0000 1.16
+++ mono-debugger.spec 26 Nov 2008 14:34:48 -0000 1.17
@@ -1,19 +1,17 @@
Summary: A debugger for Mono
Name: mono-debugger
-Version: 2.0
-Release: 5%{?dist}
+Version: 2.2
+Release: 1.pre1%{?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: mono-debugger-2.0-use-system-cecil.patch
-Patch1: md-2.0-gacutil.patch
-Patch2: monodebug-configure.patch
-Patch3: md-2.0-buildmakefile.patch
+Patch0: monodebugger-2.2-configure.patch
+Patch1: monodebugger-2.2-makefiles.patch
BuildRequires: readline-devel ncurses-devel libtool
-BuildRequires: mono-devel >= 2.0 mono-nunit
-BuildRequires: mono-nunit-devel autoconf automake
-Requires: mono-core >= 2.0
+BuildRequires: mono-devel >= 2.2 mono-nunit
+BuildRequires: mono-nunit-devel autoconf automake xsp-devel
+Requires: mono-core >= 2.2
Group: Development/Tools
ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
@@ -37,22 +35,18 @@
%prep
%setup -q
rm -rf build/*.dll
-%patch0 -p1 -b .use-system-cecil
# bit of sed magic...
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
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
+%patch0 -p1 -b .configure
+%patch1 -p1 -b .makefiles
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0}
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.
cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
-
+autoreconf -f -i -s
%build
%configure --disable-static --disable-dependency-tracking
@@ -85,6 +79,20 @@
%{_libdir}/pkgconfig/mono-debugger.pc
%changelog
+* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
+- bump to 2.2 preview 1
+
+* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-8
+- bump to RC4
+- now requires xsp-devel
+
+* Wed Sep 10 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
+- another configure patch
+- rebuild against Mono 2.0 RC 1
+
+* Wed Aug 27 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
+- argh!!!! fixed the configure patch file
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-debugger/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 26 Aug 2008 12:15:56 -0000 1.6
+++ sources 26 Nov 2008 14:34:48 -0000 1.7
@@ -1 +1 @@
-062c8051cce0b32d32a08f5059e884b0 mono-debugger-2.0.tar.bz2
+aefd6984a4035f931700dd33a75b5d66 mono-debugger-2.2.tar.bz2
--- md-2.0-buildmakefile.patch DELETED ---
--- md-2.0-gacutil.patch DELETED ---
--- mono-debugger-2.0-use-system-cecil.patch DELETED ---
--- monodebug-configure.patch DELETED ---
More information about the scm-commits
mailing list