upgpkg: python-gilt 1.2.1-2

Fixed conflict

Signed-off-by: Morten Linderud <morten@linderud.pw>

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 871cab18fa1d..aad88f51b233 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar 22 08:52:21 UTC 2018
+# Tue Mar 27 09:20:23 UTC 2018
 pkgbase = python-gilt
 	pkgdesc = A GIT layering tool
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/metacloud/gilt
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 5bce2c34f54a..56ee7a7dc2f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase="python-gilt"
 pkgname=("python-gilt" "python2-gilt")
 _pkgname='gilt'
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A GIT layering tool'
 url='https://github.com/metacloud/gilt'
 arch=('any')
@@ -56,5 +56,6 @@ package_python2-gilt() {
     cd "${srcdir}/${_pkgname}-${pkgver}-py2"
     export PBR_VERSION="${pkgver}"
     python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    mv "${pkgdir}/usr/bin/gilt" "${pkgdir}/usr/bin/gilt2"
 }
 # vim:set ft=sh ts=2 sw=2 et: