fix typo in filename, include icons, desktop file and appdata file (thx

to yochananmarqos)

2 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e378239c399f..e81d14f96bda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vorta
 	pkgdesc = A GUI for BorgBackup
 	pkgver = 0.7.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/borgbase/vorta
 	arch = any
 	license = GPL
@@ -18,12 +18,8 @@ pkgbase = vorta
 	depends = python-llfuse
 	depends = python-setuptools
 	options = !emptydirs
-	source = vorta-0.7.1.tar.gz::https://github.com/borgbase/vorta/archive/v0.7.1.zip
-	source = vorta32.png
-	source = vorta.desktop
+	source = vorta-0.7.1.tar.gz::https://github.com/borgbase/vorta/archive/v0.7.1.tar.gz
 	sha256sums = 0e292a8db41d65929a006110ac0f8d7041275ef3badb108b77878540c7d388e2
-	sha256sums = ff944c741a291f4d38cac97906376e4afa851f54f46d6de00f6fd92c4ad273f9
-	sha256sums = 6bd09fed495b0173c2fc0bdb42dde417c3ed3f2d4025927afa3826cf1205372d
 
 pkgname = vorta
 
diff --git a/PKGBUILD b/PKGBUILD
index a3fb9382fa52..1822d82c444d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bjoern Franke <bjo+aur@schafweide.org>
 pkgname=vorta
 pkgver=0.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A GUI for BorgBackup"
 arch=('any')
 url="https://github.com/borgbase/vorta"
@@ -9,19 +9,28 @@ license=('GPL')
 depends=('borg' 'python-appdirs' 'python-apscheduler' 'python-pyqt5' 'python-peewee' 'python-paramiko' 'python-dateutil' 'python-secretstorage' 'python-psutil' 'python-llfuse' 'python-setuptools')
 makedepends=('qt5-tools')
 options=(!emptydirs)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/borgbase/$pkgname/archive/v$pkgver.zip"
-        "vorta32.png"
-        "vorta.desktop")
-sha256sums=('0e292a8db41d65929a006110ac0f8d7041275ef3badb108b77878540c7d388e2'
-            'ff944c741a291f4d38cac97906376e4afa851f54f46d6de00f6fd92c4ad273f9'
-            '6bd09fed495b0173c2fc0bdb42dde417c3ed3f2d4025927afa3826cf1205372d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/borgbase/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('0e292a8db41d65929a006110ac0f8d7041275ef3badb108b77878540c7d388e2')
+
+build() {
+  cd "$pkgname-$pkgver"
+  make translations-to-qm
+  python setup.py build
+}
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 "${srcdir}/${pkgname}32.png" "$pkgdir/usr/share/pixmaps/${pkgname}32.png"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  cd "$pkgname-$pkgver"
+  export PYTHONHASHSEED=0
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 
+  install -Dm644 package/icon.svg \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/com.borgbase.Vorta.svg"
+  install -Dm644 package/icon-symbolic.svg \
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/com.borgbase.Vorta-symbolic.svg"
+  install -Dm644 "src/$pkgname/assets/metadata/com.borgbase.Vorta.appdata.xml" -t \
+    "$pkgdir/usr/share/metainfo"
+  install -Dm644 "src/$pkgname/assets/metadata/com.borgbase.Vorta.desktop" -t \
+    "$pkgdir/usr/share/applications"
 }
 
 # vim:set ts=2 sw=2 et: