summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdo Roig-Maranges2018-07-28 17:19:57 +0200
committerAbdo Roig-Maranges2018-07-28 17:19:57 +0200
commitb40e9d3bb8c7f5db39f40d7f2b8e890b66e6e6b1 (patch)
treecbe06e5a5683404a27414c1a107039a1f1a8e687
parenta4403dc03cf4a15ba983421b15ef15e023e08541 (diff)
parent7894f107139420f69c9cd850e245bf1fa79062ab (diff)
downloadaur-b40e9d3bb8c7f5db39f40d7f2b8e890b66e6e6b1.tar.gz
Merge branch 'd/update-v2'
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD20
2 files changed, 12 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 52472d2c767..a5dc0eecd75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = git-spindle-git
+pkgbase = git-spindle
pkgdesc = Git subcommands for integrating with central services like github, gitlab and bitbucket
- pkgver = 3.4.4.r25.ge174b4a
+ pkgver = 3.4.4
pkgrel = 1
url = http://github.com/seveas/git-spindle
arch = any
@@ -12,10 +12,8 @@ pkgbase = git-spindle-git
depends = python-github3.py
depends = python-whelk
depends = python-docopt
- provides = git-spindle
- conflicts = git-spindle
- source = git+https://github.com/seveas/git-spindle.git
- md5sums = SKIP
+ source = https://github.com/seveas/git-spindle/archive/3.4.4.tar.gz
+ sha256sums = b4458268535cba2e7597335ffe1882fcb5b2a5132c18e84ed8452a712b678835
-pkgname = git-spindle-git
+pkgname = git-spindle
diff --git a/PKGBUILD b/PKGBUILD
index 6047a981fca..7e04964993d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Abdó Roig-Maranges <abdo.roig@gmail.com>
-pkgname=git-spindle-git
-pkgver=3.4.4.r25.ge174b4a
+pkgname=git-spindle
+pkgver=3.4.4
pkgrel=1
pkgdesc="Git subcommands for integrating with central services like github, gitlab and bitbucket"
arch=('any')
@@ -10,17 +10,11 @@ license=('GPL3')
depends=('git' 'python' 'python-github3.py' 'python-whelk' 'python-docopt')
makedepends=('make' 'python-sphinx')
optdepends=()
-provides=('git-spindle')
-conflicts=('git-spindle')
-source=("git+https://github.com/seveas/git-spindle.git")
-md5sums=('SKIP')
-
-pkgver() {
- git --git-dir="$srcdir/git-spindle/.git" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
+source=("https://github.com/seveas/git-spindle/archive/${pkgver}.tar.gz")
+sha256sums=('b4458268535cba2e7597335ffe1882fcb5b2a5132c18e84ed8452a712b678835')
prepare() {
- cd "${srcdir}/git-spindle"
+ cd "${srcdir}/git-spindle-${pkgver}"
# NOTE: Since we only build the man page, we tweak docs configuration so that
# it does not require a sphinx theme.
@@ -28,14 +22,14 @@ prepare() {
}
build() {
- cd "$srcdir/git-spindle"
+ cd "$srcdir/git-spindle-${pkgver}"
python setup.py build
LANG=en_US.UTF-8 make -C docs man
}
package() {
- cd "$srcdir/git-spindle"
+ cd "$srcdir/git-spindle-${pkgver}"
python setup.py install --prefix=/usr --root="$pkgdir"
install -d "$pkgdir/usr/share/man/man1/"