provide compatibility symlink to libtinfo

2 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6e81de69482..92a04595f777 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ncurses5-compat-libs
 	pkgdesc = System V Release 4.0 curses emulation library, ABI 5
 	pkgver = 6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://invisible-island.net/ncurses/ncurses.html
 	arch = i686
 	arch = x86_64
@@ -9,8 +9,10 @@ pkgbase = ncurses5-compat-libs
 	depends = glibc
 	depends = gcc-libs
 	depends = sh
-	source = http://invisible-mirror.net/archives/ncurses/ncurses-6.0.tar.gz
-	source = http://invisible-mirror.net/archives/ncurses/ncurses-6.0.tar.gz.asc
+	provides = libtinfo5
+	conflicts = libtinfo5
+	source = http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz
+	source = http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz.sig
 	validpgpkeys = C52048C0C0748FEE227D47A2702353E0F7E48EDB
 	md5sums = ee13d052e1ead260d7c28071f46eefb1
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2fea5cbbd556..6363c4a1e748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,17 @@
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
-# Before you complain about unverifiable signature, please read Allan's post:
-# http://allanmcrae.com/2015/01/two-pgp-keyrings-for-package-management-in-arch-linux/
-# TLDR: gpg --keyserver pgp.mit.edu --recv-keys C52048C0C0748FEE227D47A2702353E0F7E48EDB
-
 pkgname=ncurses5-compat-libs
 _pkgname=ncurses
 pkgver=6.0
-pkgrel=3
+pkgrel=4
 pkgdesc='System V Release 4.0 curses emulation library, ABI 5'
 arch=('i686' 'x86_64')
 url='http://invisible-island.net/ncurses/ncurses.html'
 license=('MIT')
 depends=('glibc' 'gcc-libs' 'sh')
+provides=('libtinfo5')
+conflicts=('libtinfo5')
 source=(http://ftp.gnu.org/gnu/ncurses/ncurses-${pkgver/_/-}.tar.gz{,.sig})
 md5sums=('ee13d052e1ead260d7c28071f46eefb1'
          'SKIP')
@@ -32,14 +30,17 @@ build() {
 package() {
   cd $_pkgname-${pkgver/_/-}
   make DESTDIR="$pkgdir" install.libs
-  rm -rf "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig "$pkgdir"/usr/lib/*.so
+  rm -rf "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig \
+    "$pkgdir"/usr/lib/*.so
 
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses ncurses++ form panel menu; do
-    ln -s /usr/lib/lib${lib}w.so.5 "$pkgdir"/usr/lib/lib${lib}.so.5
+    ln -s /usr/lib/lib${lib}w.so.5 "$pkgdir/usr/lib/lib${lib}.so.5"
   done
+  ln -s /usr/lib/libncurses.so.5 "$pkgdir/usr/lib/libtinfo.so.5"
 
   # install license, rip it from the readme
-  install -d "$pkgdir"/usr/share/licenses/$pkgname
-  grep -B 100 '$Id' README > "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  grep -B 100 '$Id' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
 }