use included .desktop, fix conflicts

1 files changed, 11 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 56c4a8cb6086..5abd9366a76a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,16 @@
 pkgname=orion
 pkgver=1.5.1rc
 _dversion=1.5.1-rc
-pkgrel=2
+pkgrel=3
 pkgdesc="QML/C++-written desktop client for Twitch.tv"
 arch=('x86_64' 'i686')
 url="https://github.com/alamminsalo/orion/"
 license=('GPL')
-depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'hicolor-icon-theme' 'gst-libav')
+depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'gst-libav')
 provides=("${pkgname}")
-conflicts=("${pkgname%-git}")
-source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz"
-        "Orion.desktop"
-)
-
-sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f'
-            '8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3')
+conflicts=("$pkgname-git")
+source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz")
+sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f')
 
 build() {
 	cd "$srcdir/${pkgname}-${_dversion}"
@@ -27,12 +23,11 @@ build() {
 }
 
 package() {
-    mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
-    mkdir -p "$pkgdir/usr/share/applications"
-    mkdir -p "$pkgdir/usr/bin"
-
     cd "$srcdir/${pkgname}-${_dversion}"
-	cp "distfiles/orion.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/" 
-	cp "../Orion.desktop" "$pkgdir/usr/share/applications/"
-	cp "orion" "$pkgdir/usr/bin/" 
+    
+    sed -e "s|Icon=/usr/local/share/icons/orion.svg|Icon=orion|" -i distfiles/Orion.desktop
+
+    install -Dm644 distfiles/orion.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/orion.svg
+    install -Dm644 distfiles/Orion.desktop ${pkgdir}/usr/share/applications/Orion.desktop
+    install -Dm755 orion ${pkgdir}/usr/bin/orion
 }