summaryrefslogtreecommitdiffstats
path: root/abs/core-testing
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-03-18 21:55:43 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-03-18 21:55:43 (GMT)
commit984ace971e3311468a6e9cd7674a0349861e62a0 (patch)
treef6f15867eefc48d2b38ad4e637dacdba8770956e /abs/core-testing
parenta6a1dc97a49084f7d3360a6a880c5fa112ebc597 (diff)
downloadlinhes_pkgbuild-984ace971e3311468a6e9cd7674a0349861e62a0.zip
linhes_pkgbuild-984ace971e3311468a6e9cd7674a0349861e62a0.tar.gz
linhes_pkgbuild-984ace971e3311468a6e9cd7674a0349861e62a0.tar.bz2
Nvidia drivers: General cleanup of provides and conflicts.
There appears to be a bug with pacman wrt sorting out "provides dependencies" so the recommended way to switch between the nvidia and beta drivers is. pacman -Rd nvidia nvidia-utils pacman -S nvidia-beta nvidia-utils-beta.
Diffstat (limited to 'abs/core-testing')
-rw-r--r--abs/core-testing/nvidia/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index 9312766..5a230ba 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -4,14 +4,14 @@
pkgname=nvidia
pkgver=180.29
_kernver='2.6.28-LinHES'
-pkgrel=2
+pkgrel=4
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils')
-conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy')
+conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy' 'nvidia-beta')
license=('custom')
install=nvidia.install
source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run)