summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhashworks2020-04-22 12:30:23 +0200
committerhashworks2020-04-22 12:30:23 +0200
commit920f6510aa3e03c42d8ab91215cdd30ca8ad446c (patch)
tree38a92b2cd2d414fbd22b46c579c188dd29c9a624
parentc00db7c1d6e8b01c4fa26802a5d79d80d159065d (diff)
downloadaur-920f6510aa3e03c42d8ab91215cdd30ca8ad446c.tar.gz
Follow proper VCS guidelines, update package(), fix license
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD36
2 files changed, 24 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8925933d4e42..e9b4a15f9562 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = kiwix-desktop-git
pkgdesc = Offline reader for Web content, especially intended to make Wikipedia available offline.
- pkgver = 2.0
+ pkgver = 2.0.1.r0.gfc9e9a1
pkgrel = 1
- url = https://www.kiwix.org/
+ url = https://github.com/kiwix/kiwix-desktop
arch = i686
arch = x86_64
- license = GPLv3
+ license = GPL3
makedepends = qt5-tools
depends = qt5-base
depends = qt5-webengine
@@ -14,7 +14,7 @@ pkgbase = kiwix-desktop-git
depends = kiwix-lib
provides = kiwix-desktop
conflicts = kiwix-desktop
- source = kiwix-desktop-git::git://github.com/kiwix/kiwix-desktop.git
+ source = kiwix-desktop::git+https://github.com/kiwix/kiwix-desktop
md5sums = SKIP
pkgname = kiwix-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 92686a1fbdc4..699df44b686b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,34 @@
-# Maintainer: soloturn@gmail.com
+# Maintainer: hashworks <mail@hashworks.net>
+# Contributor: soloturn@gmail.com
# Contributor: nic96
-_basename=kiwix-desktop
-pkgname="$_basename-git"
-pkgver=2.0
+pkgname=kiwix-desktop-git
+pkgver=2.0.1.r0.gfc9e9a1
pkgrel=1
pkgdesc="Offline reader for Web content, especially intended to make Wikipedia available offline."
-url="https://www.kiwix.org/"
-arch=('i686' 'x86_64')
-license=('GPLv3')
+url="https://github.com/kiwix/kiwix-desktop"
+arch=("i686" "x86_64")
+license=("GPL3")
depends=("qt5-base" "qt5-webengine" "qt5-svg" "qt5-imageformats" "kiwix-lib")
makedepends=("qt5-tools")
-conflicts=("$_basename")
-provides=("$_basename")
+conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}")
+source=("${pkgname%-git}::git+${url}")
+md5sums=("SKIP")
-source=("$pkgname::git://github.com/kiwix/$_basename.git")
-md5sums=('SKIP')
+pkgver() {
+ cd "$srcdir/${pkgname%-git}"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
build() {
- cd $pkgname
- qmake PREFIX=$pkgdir/usr
- make
+ cd "$srcdir/${pkgname%-git}"
+ qmake PREFIX="$pkdir/usr"
+ make
}
package() {
- cd $pkgname
- make install
+ cd "$srcdir/${pkgname%-git}"
+ make INSTALL_ROOT="$pkgdir/" install
}