summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD24
2 files changed, 17 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a66a41435b9..38df298a31a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
-# Generated by mksrcinfo v8
-# Sun Feb 21 20:59:53 UTC 2016
pkgbase = git-imerge-git
pkgdesc = Incremental merge for git
- pkgver = 0
+ pkgver = 1.1.0.r20.g9d51192
pkgrel = 1
url = https://github.com/mhagger/git-imerge
changelog = git-imerge-git.changelog
arch = any
license = GPL2
- makedepends = git
- depends = python2
+ makedepends = python-setuptools
+ makedepends = bash-completion
+ depends = python
depends = git
- source = git://github.com/mhagger/git-imerge.git
+ source = git+https://github.com/mhagger/git-imerge.git
sha256sums = SKIP
pkgname = git-imerge-git
diff --git a/PKGBUILD b/PKGBUILD
index fb63cf583ab6..d6a92692afd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Magnus Therning <magnus@therning.org>
+# Maintainer: Rafael Ascensão <rafa dot almas at gmail dot com>
+# Contributor: Magnus Therning <magnus@therning.org>
pkgname=git-imerge-git
_pkgname=git-imerge
-pkgver=0
+pkgver=1.1.0.r20.g9d51192
pkgrel=1
pkgdesc='Incremental merge for git'
arch=('any')
-license=('GPL2')
url='https://github.com/mhagger/git-imerge'
-depends=('python2' 'git')
-makedepends=('git')
+license=('GPL2')
+depends=('python' 'git')
+makedepends=('python-setuptools' 'bash-completion')
changelog=${pkgname}.changelog
-source=('git://github.com/mhagger/git-imerge.git')
+source=('git+https://github.com/mhagger/git-imerge.git')
sha256sums=('SKIP')
pkgver() {
@@ -20,12 +21,11 @@ pkgver() {
}
build() {
- echo "nothing to build"
+ cd "${srcdir}/${_pkgname}"
+ python setup.py build
}
-package () {
- cd "${srcdir}"/${_pkgname}
- install -D -m755 git-imerge "${pkgdir}"/usr/bin/git-imerge
- install -D -m644 git-imerge.bashcomplete \
- "${pkgdir}"/usr/share/bash-completion/completions/git-imerge
+package() {
+ cd "${srcdir}/${_pkgname}"
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
}