Update to 2.1.1-2 fixed no simulation

2 files changed, 12 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2c4b1116a5d..18a809d6fcae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opentx-companion
 	pkgdesc = EEPROM Editor for OpenTX RC transmitter firmwares
 	pkgver = 2.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.open-tx.org/
 	arch = x86_64
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index b2e43a5e515b..8e36dd2c94fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Jeff Youdontneedtoknow <jeffpublicjr at gmail dot com>
+# Contributer: Arnaud
 pkgname=opentx-companion
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="EEPROM Editor for OpenTX RC transmitter firmwares"
 arch=('x86_64')
 url="http://www.open-tx.org/"
@@ -17,20 +18,17 @@ build() {
   sed -i -e 's/env python/env python2.7/' $srcdir/opentx-$pkgver/radio/util/*.py
   sed -i -e 's/@python/@python2.7/' $srcdir/opentx-$pkgver/radio/src/Makefile
   cd $srcdir/opentx-$pkgver/companion
-  mkdir lbuild
+  mkdir -p lbuild
   cd lbuild
-  cmake ../src
-  make clean
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ../src
   make
-  mv $srcdir/opentx-$pkgver/companion/lbuild/companion.desktop $srcdir/opentx-$pkgver/companion/src/companion.desktop
-  sed -i -e 's/Categories=Application/Categories=Development;/' $srcdir/opentx-$pkgver/companion/src/companion.desktop
-  sed -i -e 's/Icon=companion21/Icon=companion/' $srcdir/opentx-$pkgver/companion/src/companion.desktop
-  sed -i -e 's/Name=Companion 2.1.1/Name=Companion/' $srcdir/opentx-$pkgver/companion/src/companion.desktop
 }
 
 package() {
-  cd $srcdir/opentx-$pkgver/companion/
-  install -Dm755 lbuild/companion21 $pkgdir/usr/bin/companion21
-  install -Dm644 src/companion.desktop $pkgdir/usr/share/applications/companion.desktop
-  install -Dm644 src/icon.png $pkgdir/usr/share/icons/companion.png
-}
\ No newline at end of file
+  cd $srcdir/opentx-$pkgver/companion/lbuild
+  make DESTDIR=$pkgdir/ install
+  cd $pkgdir/usr/share/applications
+  sed -i -e 's/Categories=Application/Categories=Development;/' companion21.desktop
+  sed -i -e 's/Categories=Application/Categories=Development;/' simulator21.desktop
+  rm -Rf $pkgdir/lib
+}