upgpkg: notes-tree 1.0-2

Fix misc. packaging issues

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 014a26ae1b6d..40529be48622 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = notes-tree
 	pkgdesc = Note taking (knowledge base) app with tree like notes structure
 	pkgver = 1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/baltic/notestree/src
 	arch = i686
 	arch = x86_64
@@ -11,8 +11,7 @@ pkgbase = notes-tree
 	depends = qt5-svg
 	depends = qt5-webkit
 	depends = boost-libs
-	depends = gtk-update-icon-cache
-	depends = desktop-file-utils
+	noextract = notes-tree-1.0.tar.xz
 	source = https://bitbucket.org/baltic/notestree/downloads/notes-tree-1.0.tar.xz
 	sha256sums = ad81cd9e064e9640783a260e4f19f30e971a7fd5f22ed06272c7c7b04d1ef711
 
diff --git a/PKGBUILD b/PKGBUILD
index d71264029d5e..068b5e705ac8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,35 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
+# Fixer-upper: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: baltic <1000Hz.radiowave at google mail>
 
-# Maintainer: baltic <1000Hz.radiowave at google mail>
 pkgname=notes-tree
 pkgver=1.0
-pkgrel=1
-epoch=
+pkgrel=2
 pkgdesc="Note taking (knowledge base) app with tree like notes structure"
 arch=('i686' 'x86_64' 'aarch64')
 url="https://bitbucket.org/baltic/notestree/src"
 license=('ZLIB')
-depends=(
-	'qt5-svg'
-	'qt5-webkit'
-	'boost-libs'
-	'gtk-update-icon-cache'
-	'desktop-file-utils')
-makedepends=(
-	'boost')
+depends=('qt5-svg' 'qt5-webkit' 'boost-libs')
+makedepends=('boost')
 source=("https://bitbucket.org/baltic/notestree/downloads/$pkgname-$pkgver.tar.xz")
+noextract=("$pkgname-$pkgver.tar.xz")
 sha256sums=('ad81cd9e064e9640783a260e4f19f30e971a7fd5f22ed06272c7c7b04d1ef711')
-validpgpkeys=()
+
+prepare() {
+    # versioned source extraction is nice, but makepkg can't automagically guess
+    # how to do this when the source archive doesn't use it.
+    mkdir -p "$pkgname-$pkgver"
+    tar xf "$pkgname-$pkgver.tar.xz" -C "$pkgname-$pkgver"
+}
 
 build() {
-	cd "$srcdir"
-	qmake-qt5
-	make -j$(nproc)
+    cd "$srcdir/$pkgname-$pkgver"
+    qmake-qt5
+    make
 }
 
 package() {
-	cd "$srcdir"
-	make INSTALL_ROOT=$pkgdir install
+    cd "$srcdir/$pkgname-$pkgver"
+    make INSTALL_ROOT="$pkgdir" install
+
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }