Split terminfo package out

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>

2 files changed, 56 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f8e507f8300..bbd6b7a2f8cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,27 @@
 pkgbase = termite-git
 	pkgdesc = A simple VTE-based terminal
-	pkgver = 10.13.geb1628c
+	pkgver = 12.r20.g37309fd
 	pkgrel = 1
-	epoch = 1
 	url = https://github.com/thestinger/termite/
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = git
-	depends = vte3-ng
-	depends = xdg-utils
-	provides = termite
-	conflicts = termite
-	backup = etc/xdg/termite/config
+	makedepends = vte3-ng
+	makedepends = ncurses
 	source = git://github.com/thestinger/termite
+	source = git+https://github.com/thestinger/util
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = termite-git
+	pkgdesc = A simple VTE-based terminal
+	depends = vte3-ng
+	depends = termite-terminfo-git
+	conflicts = termite
+	backup = etc/xdg/termite/config
+
+pkgname = termite-terminfo-git
+	pkgdesc = Terminfo for Termite, a simple VTE-based terminal
+	conflicts = termite-terminfo
 
diff --git a/PKGBUILD b/PKGBUILD
index 3f5da75083a5..acee221b9761 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,53 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-_gitname=termite
-pkgname=termite-git
-pkgver=10.13.geb1628c
-pkgver() { cd $_gitname && git describe | sed 's/^v//; s/-/./g'; }
+pkgname=(termite-git termite-terminfo-git)
+pkgver=12.r20.g37309fd
 pkgrel=1
-epoch=1
+
 pkgdesc="A simple VTE-based terminal"
-arch=('i686' 'x86_64')
 url="https://github.com/thestinger/termite/"
+arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('vte3-ng' 'xdg-utils')
-makedepends=('git')
-provides=(termite)
-conflicts=(termite)
-backup=(etc/xdg/termite/config)
-source=(git://github.com/thestinger/termite)
-md5sums=('SKIP')
+
+makedepends=('git' 'vte3-ng' 'ncurses')
+
+source=(git://github.com/thestinger/termite
+        git+https://github.com/thestinger/util)
+
+md5sums=(SKIP SKIP)
+
+pkgver() {
+  cd termite
+  git describe --long --always | sed 's/^v//; s/-/.r/; s/-/./'
+}
+
+prepare() {
+  cd termite
+  git submodule init
+  git config submodule.util.url "$srcdir"/util
+  git submodule update
+}
 
 build() {
-  cd $_gitname
-  git submodule update --init
+  cd termite
   make
 }
 
-package() {
-  cd $_gitname
+package_termite-git() {
+  pkgdesc="A simple VTE-based terminal"
+  depends=('vte3-ng' 'termite-terminfo-git')
+  conflicts=('termite')
+  backup=(etc/xdg/termite/config)
+
+  cd termite
   make PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 config "$pkgdir/etc/xdg/termite/config"
+  rm -rf "$pkgdir"/usr/share/terminfo
+  install -Dm644 config "$pkgdir"/etc/xdg/termite/config
+}
+
+package_termite-terminfo-git() {
+  pkgdesc='Terminfo for Termite, a simple VTE-based terminal'
+  conflicts=('termite-terminfo')
+
+  cd termite
+  install -d "$pkgdir"/usr/share/terminfo
+  tic -x termite.terminfo -o "$pkgdir"/usr/share/terminfo
 }