classpath: unb0rk classpath-minimal-native. Partly fixes 2296.

diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index 8a08a6c..f8e88a0 100644 (file)
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -1,8 +1,9 @@
 require classpath.inc
 
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
+PR = "r1"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+S = "${WORKDIR}/classpath-${PV}"
 
 inherit native
 

diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index e66f5d7..1d684c0 100644 (file)
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,6 +8,7 @@ RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
+           file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
 inherit autotools