summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoramagura2015-09-19 14:20:01 -0600
committeramagura2015-09-19 14:20:01 -0600
commit4f252a3e6740e0129e3a44faba205f85956d8ba6 (patch)
tree4344b6e786ee0b6f4d40f55b752e66aa35327545
parentfc718e80d2bd9d7c997757013967cf2c00f493c1 (diff)
downloadaur-4f252a3e6740e0129e3a44faba205f85956d8ba6.tar.gz
updates to fix the issues with conflicting files
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7737f43bcc23..fbc42df50967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
pkgbase = libtinfo
pkgdesc = symlink to ncurses for use in cuda and other packages
pkgver = 6
- pkgrel = 1
+ pkgrel = 2
url = http://www.gnu.org/software/ncurses/
arch = any
license = unknown
depends = ncurses
pkgname = libtinfo
+ conflicts = libtinfo-5
pkgname = libtinfo-5
+ conflicts = libtinfo
diff --git a/PKGBUILD b/PKGBUILD
index 26a4026ff22b..ddb35b91ef83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
# Maintainer: Alexej Magura <agm2819*gmail*>
#
#
-pkgbase=libtinfo
pkgname=(libtinfo libtinfo-5)
pkgver=6
-pkgrel=1
+pkgrel=2
pkgdesc="symlink to ncurses for use in cuda and other packages"
arch=('any')
url="http://www.gnu.org/software/ncurses/"
@@ -13,12 +12,16 @@ depends=('ncurses')
_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)
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