Update PKGBUILD to use tags

Store service file in src tree

Change-Id: Ia0dd6183739fcd2fc7abaf7068618ae3aecfeb30

2 files changed, 5 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3844f382fcdc..9965f3c7f89b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 set -e
 
-_pi_ver=2
+_pi_ver=3
 pkgname="pi-compositor"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=1
 provides=("pi-launcher")
 conflicts=("pi-launcher")
 replaces=("pi-launcher")
-pkgdesc="Rudimentary QML compositor branched off qtwayland/examples/wayland/qml-compositor "
+pkgdesc="Rudimentary QML compositor branched off qtwayland/examples/wayland/qml-compositor"
 arch=("any")
 url="http://www.qt.io"
 license=("LGPL3" "GPL3")
 makedepends=("qt-sdk-raspberry-pi${_pi_ver}")
 depends=("qt-sdk-raspberry-pi-target-libs" "qcec")
-source=("git://github.com/sirspudd/${pkgname}.git")
+source=("git://github.com/sirspudd/${pkgname}.git#tag=v${pkgver}")
 sha256sums=("SKIP")
 options=('!strip')
 
@@ -37,5 +37,5 @@ package() {
   mkdir -p $systemd_deploy_path
 
   cp ${repo_src}/${pkgname} ${deploy_path}
-  cp ${startdir}/*.service ${systemd_deploy_path}
+  cp ${repo_src}/resources/*.service ${systemd_deploy_path}
 }
diff --git a/pi-launcher@.service b/pi-launcher@.service
deleted file mode 100644
index 3b37166075e2..000000000000
--- a/pi-launcher@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-# Forked off xlogin@.service
-
-[Unit]
-Description=Qt-compositor login for user %i
-After=x@vt7.service systemd-user-sessions.service
-Wants=x@vt7.service
-Conflicts=getty@tty7.service
-
-[Service]
-User=%i
-WorkingDirectory=~
-TTYPath=/dev/tty7
-PAMName=login
-ExecStart=-/opt/pi-compositor/pi-compositor -platform eglfs -plugin CECKeyboard
-
-[Install]
-WantedBy=graphical.target