9 files changed, 54 insertions, 40 deletions
diff --git a/packages/mono/README b/packages/mono/README
index 81e478bdb7..39479308b2 100644
--- a/packages/mono/README
+++ b/packages/mono/README
@@ -3,7 +3,7 @@ Mono in OE is still very much a work in progress.
   - is reported to work on MIPS.  
   - has floating point problems on ARM
 
-1.2.5pre5
+1.2.5
   - tested on ARM EABI.  Floating point issues have been worked around.
 
 There is still a lot of packaging work that needs done to package the mono dll's for installation.
diff --git a/packages/mono/files/mono-fix-libdir-path.patch b/packages/mono/files/mono-fix-libdir-path.patch
new file mode 100644
index 0000000000..9255117bf8
--- /dev/null
+++ b/packages/mono/files/mono-fix-libdir-path.patch
@@ -0,0 +1,11 @@
+--- mono-1.2.5/scripts/Makefile.am.orig	2007-09-27 04:23:39.000000000 +0200
++++ mono-1.2.5/scripts/Makefile.am	2007-09-27 04:24:19.000000000 +0200
+@@ -92,7 +92,7 @@
+ mono_instdir = $(shell cygpath -m $(libdir))/mono
+ else
+ plat_bindir = $(bindir)
+-mono_instdir = $(prefix)/lib/mono
++mono_instdir = $(libdir)/mono
+ endif
+ 
+ REWRITE_COMMON = sed \
diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/mono/mono-1.2.5.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mono/mono-1.2.5/.mtn2git_empty
+++ b/packages/mono/mono-1.2.5.1/.mtn2git_empty
diff --git a/packages/mono/mono-1.2.5/configure.patch b/packages/mono/mono-1.2.5.1/configure.patch
index 1553115c0e..1553115c0e 100644
--- a/packages/mono/mono-1.2.5/configure.patch
+++ b/packages/mono/mono-1.2.5.1/configure.patch
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
new file mode 100644
index 0000000000..09223ddcab
--- /dev/null
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -0,0 +1,21 @@
+require mono_1.2.5.inc
+PR = "r1"
+DEPENDS = "glib-2.0-native"
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+
+inherit native
+
+#do_stage_prepend() {
+#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+#}
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
diff --git a/packages/mono/mono-native_1.2.5.bb b/packages/mono/mono-native_1.2.5.bb
deleted file mode 100644
index 0f1391cd25..0000000000
--- a/packages/mono/mono-native_1.2.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require mono_1.2.5.inc
-PR = "r2"
-DEPENDS = "glib-2.0-native"
-
-inherit native
-
-#do_stage_prepend() {
-#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
-
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
new file mode 100644
index 0000000000..e1f3f1b6a5
--- /dev/null
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -0,0 +1,19 @@
+require mono_1.2.5.inc
+
+DEPENDS = "mono-native glib-2.0"
+
+PR = "r1"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+do_install_append() {
+	install -d ${D}${libdir}/mono/1.0/
+	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
+}
+
+EXTRA_OECONF += " --disable-mcs-build "
+
+PACKAGES =+ "mono-dll"
+FILES_mono-dll = "${libdir}/mono/1.0/"
+
+
diff --git a/packages/mono/mono_1.2.5.bb b/packages/mono/mono_1.2.5.bb
deleted file mode 100644
index c0a4cfb223..0000000000
--- a/packages/mono/mono_1.2.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require mono_1.2.5.inc
-
-#DEPENDS = "mono-native glib-2.0"
-# for now, we skip the mono-native build -- just install
-# mono using your distro package manager for now
-# after we get the target version working, we'll worry
-# about the native package for systems that don't have mono
-# installed
-DEPENDS = "glib-2.0"
-
-PR = "r0"
-
-SRC_URI += "file://configure.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
-}
-
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
-
-
diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc
index 0e0df1caf2..aeca713d6b 100644
--- a/packages/mono/mono_1.2.5.inc
+++ b/packages/mono/mono_1.2.5.inc
@@ -2,15 +2,11 @@ DESCRIPTION = "Mono Programming Language"
 SECTION = "devel/mono"
 LICENSE = "GPL LGPL X11"
 
-# the md5 sum check is required because Novell does not version their pre release versions of mono
-# if the md5sum check fails, contact cbrake on #oe
-# checksums are stored in conf/checksums.ini
-SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2"
+SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2"
 
-S = "${WORKDIR}/mono-1.2.5"
+S = "${WORKDIR}/mono-${PV}"
 
 inherit autotools
-EXTRA_OECONF = "--disable-mcs-build"
 EXTRA_OECONF_arm = "--without-tls"
 EXTRA_OECONF_mipsel = "--without-tls"