4 files changed, 7 insertions, 4 deletions
diff --git a/packages/cmake/cmake-native_2.4.7.bb b/packages/cmake/cmake-native_2.4.7.bb
new file mode 100644
index 0000000000..fcfdda1c1a
--- /dev/null
+++ b/packages/cmake/cmake-native_2.4.7.bb
@@ -0,0 +1,3 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
+inherit native
diff --git a/packages/cmake/cmake-native_2.2.3.bb b/packages/cmake/cmake.inc
index b4e84cc093..83475bb5eb 100644
--- a/packages/cmake/cmake-native_2.2.3.bb
+++ b/packages/cmake/cmake.inc
@@ -7,14 +7,12 @@ HOMEPAGE = "http://www.cmake.org/"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
 
-SRC_URI = "http://www.cmake.org/files/v2.2/cmake-${PV}.tar.gz"
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
 
 inherit autotools
 
 S = "${WORKDIR}/cmake-${PV}"
 
-inherit native
-
 do_configure () {
 	./configure --prefix=${base_prefix} || die "./bootstrap failed"
 }
diff --git a/packages/cmake/cmake_2.4.7.bb b/packages/cmake/cmake_2.4.7.bb
new file mode 100644
index 0000000000..619aea9701
--- /dev/null
+++ b/packages/cmake/cmake_2.4.7.bb
@@ -0,0 +1,2 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index 0a204bb535..c609fefb81 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -8,7 +8,7 @@ PR = "r2"
 QTVER = "qtopia-core-opensource-src-${QTVERSION}"
 
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
            file://0008-backport-qt-lib-infix.patch;patch=1 \
            file://qt-config.patch;patch=1 \