Update piaware-git to use new faup1090 location, separate tcllauncher & mlat-client packages

2 files changed, 15 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73521487d14f..3617be8609ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = piaware-git
 	pkgdesc = Client-side package and programs for forwarding ADS-B data to FlightAware
-	pkgver = 2.1.2.r1.ga1076de
-	pkgrel = 2
+	pkgver = 2.1.2.r10.g2f24f62
+	pkgrel = 1
 	url = https://github.com/flightaware/piaware
 	install = piaware-git.install
 	arch = i686
@@ -13,6 +13,7 @@ pkgbase = piaware-git
 	makedepends = autoconf
 	makedepends = tcl
 	makedepends = python
+	makedepends = tcllauncher-git
 	depends = dump1090-fa-git
 	depends = tcl
 	depends = tcllib
@@ -20,11 +21,9 @@ pkgbase = piaware-git
 	depends = tk
 	depends = tls
 	depends = python
+	depends = tcllauncher-git
+	optdepends = mlat-client-git: M-LAT support
 	source = piaware::git+git://github.com/flightaware/piaware
-	source = tcllauncher::git+git://github.com/flightaware/tcllauncher.git
-	source = mlat::git+git://github.com/mutability/mlat-client.git
-	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = piaware-git
diff --git a/PKGBUILD b/PKGBUILD
index 65a47e2b57ff..4c2544e8d9cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=piaware-git
 _gitname=piaware
-pkgver=2.1.2.r1.ga1076de
-pkgrel=2
+pkgver=2.1.2.r10.g2f24f62
+pkgrel=1
 
 pkgdesc="Client-side package and programs for forwarding ADS-B data to FlightAware"
 
@@ -12,42 +12,28 @@ arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/flightaware/piaware"
 license=('BSD')
 
-depends=('dump1090-fa-git' 'tcl' 'tcllib' 'tclx' 'tk' 'tls' 'python')
-makedepends=('git' 'autoconf' 'tcl' 'python')
+depends=('dump1090-fa-git' 'tcl' 'tcllib' 'tclx' 'tk' 'tls' 'python' 'tcllauncher-git')
+makedepends=('git' 'autoconf' 'tcl' 'python' 'tcllauncher-git')
+optdepends=('mlat-client-git: M-LAT support')
 
-source=('piaware::git+git://github.com/flightaware/piaware'
-	'tcllauncher::git+git://github.com/flightaware/tcllauncher.git'
-	'mlat::git+git://github.com/mutability/mlat-client.git')
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP')
+source=('piaware::git+git://github.com/flightaware/piaware')
+md5sums=('SKIP')
 install=piaware-git.install
 
 _gitname=piaware
-_gitname2=tcllauncher
-_gitname3=mlat
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "${srcdir}/${_gitname2}"
-  autoconf
-  ./configure 
-#--prefix=${pkgdir}/usr --exec-prefix=${pkgdir}/usr
-}
-
 package() {
-  cd "${srcdir}/${_gitname2}"
-  make install DESTDIR=${pkgdir}
 
+  install -D /usr/bin/tcllauncher ${pkgdir}/usr/bin/tcllauncher
   cd "${srcdir}/${_gitname}"
   make install DESTDIR=${pkgdir} SYSTEMD=usr/lib/systemd/system
-
-  cd "${srcdir}/${_gitname3}"
-  ./setup.py install --prefix="${pkgdir}"/usr
+  rm ${pkgdir}/usr/bin/tcllauncher
 
   chmod -x "${pkgdir}/usr/lib/systemd/system/piaware.service"
+  install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }