Updated to build from mavlink repo where pymavlink is a submodule

2 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 970d0c40a1de..f8e5bc8a54ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pymavlink-git
 	pkgdesc = python MAVLink interface and utilities
-	pkgver = r2496.264c3e46
-	pkgrel = 2
+	pkgver = r2452.a1c7106
+	pkgrel = 1
 	url = https://github.com/ArduPilot/pymavlink/
 	arch = x86_64
 	license = LGPL v3
@@ -10,10 +10,8 @@ pkgbase = python-pymavlink-git
 	depends = python-lxml
 	provides = python-pymavlink
 	conflicts = python-pymavlink
-	source = git+https://github.com/ArduPilot/pymavlink/
 	source = git+https://github.com/mavlink/mavlink/
 	md5sums = SKIP
-	md5sums = SKIP
 
 pkgname = python-pymavlink-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8e24d8ceb05e..48a054979655 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # contact me via AUR or archlinux forums
 project='pymavlink'
 pkgname=python-${project}-git # '-bzr', '-git', '-hg' or '-svn'
-pkgver=r2496.264c3e46
-pkgrel=2
+pkgver=r2452.a1c7106
+pkgrel=1
 pkgdesc="python MAVLink interface and utilities"
 arch=('x86_64')
 url="https://github.com/ArduPilot/pymavlink/"
@@ -17,16 +17,21 @@ replaces=()
 backup=()
 options=()
 install=
-source=('git+https://github.com/ArduPilot/pymavlink/'
-        'git+https://github.com/mavlink/mavlink/')
+source=('git+https://github.com/mavlink/mavlink/')
 noextract=()
-md5sums=('SKIP' 'SKIP')
+md5sums=('SKIP')
 
 # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for
 # a description of each element in the source array.
 
+prepare() {
+	cd "$srcdir/mavlink"
+    git submodule init
+    git submodule update
+}
+
 pkgver() {
-	cd "$srcdir/${project}"
+	cd "$srcdir/mavlink/${project}"
 
 # Git, tags available
 #	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
@@ -36,18 +41,13 @@ pkgver() {
 
 }
 
-prepare() {
-	cd "$srcdir/${project}"
-    ln -s ../mavlink/message_definitions ./
-}
-
 build() {
-	cd "$srcdir/${project}"
+	cd "$srcdir/mavlink/${project}"
     python setup.py build
 }
 
 package() {
-	cd "$srcdir/${project}"
+	cd "$srcdir/mavlink/${project}"
 	python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build
 
     install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname%-git}