updates to fix issues with libtinfo v6

2 files changed, 9 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbc42df50967..5e82a639ab7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
 pkgbase = libtinfo
 	pkgdesc = symlink to ncurses for use in cuda and other packages
 	pkgver = 6
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gnu.org/software/ncurses/
 	arch = any
 	license = unknown
-	depends = ncurses
-
-pkgname = libtinfo
+	depends = ncurses>=6.0
 	conflicts = libtinfo-5
 
-pkgname = libtinfo-5
-	conflicts = libtinfo
+pkgname = libtinfo
 
diff --git a/PKGBUILD b/PKGBUILD
index ddb35b91ef83..e7220511b4d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,18 @@
-# Maintainer: Alexej Magura <agm2819*gmail*>
+# Maintainer: Alexej Magura <sickhadas.nix*gmail*>
 #
 #
-pkgname=(libtinfo libtinfo-5)
+pkgname=libtinfo
 pkgver=6
-pkgrel=2
+pkgrel=3
 pkgdesc="symlink to ncurses for use in cuda and other packages"
 arch=('any')
 url="http://www.gnu.org/software/ncurses/"
 license=('unknown')
-depends=('ncurses')
+conflicts=('libtinfo-5')
+depends=('ncurses>=6.0')
 _ncurses="$(pacman -Q $depends | awk '{sub(/-[0-9]+/, "", $2); print $2}')"
 
-package_libtinfo-5() {
-  conflicts=(libtinfo)
-  pkgver=5
-  pkgrel=7
-  install -d "$pkgdir"/usr/lib
-  ln -s /usr/lib/libncurses.so."$_ncurses" -T "$pkgdir"/usr/lib/libtinfo.so."$pkgver"
-  ln -s /usr/lib/libtinfo.so."$pkgver" -T "$pkgdir"/usr/lib/libtinfo.so
-}
-
-package_libtinfo() {
-  conflicts=(libtinfo-5)
+package() {
   install -d "$pkgdir"/usr/lib
   ln -s /usr/lib/libncursesw.so."$_ncurses" -T "$pkgdir"/usr/lib/libtinfo.so."$pkgver"
   ln -s /usr/lib/libtinfo.so."$pkgver" -T "$pkgdir"/usr/lib/libtinfo.so