2 files changed, 20 insertions, 25 deletions
diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD
index 7b455b1cc..05e501cda 100644
--- a/community-testing/catalyst-dkms/PKGBUILD
+++ b/community-testing/catalyst-dkms/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77331 2012-10-08 22:59:34Z lcarlier $
+# $Id: PKGBUILD 78743 2012-10-23 22:15:52Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
 # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
 
 pkgname=catalyst-dkms
-pkgver=12.9
-pkgrel=0.1
+pkgver=12.10
+pkgrel=1
 pkgdesc="AMD proprietary gpu kernel driver"
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
@@ -14,10 +14,9 @@ depends=('dkms')
 optdepends=('linux-headers: build the module against Arch kernel'
             'linux-lts-headers: build the module against LTS Arch kernel')
 replaces=('catalyst-lts-dkms') # useless
-source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
-        https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip
         dkms.conf)
-md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b'
+md5sums=('ef6ecd984e47e80849215b33fbfa5b7f'
          '972049dc247a74a7162f2227078abcb0')
 install=catalyst.install
 
@@ -32,14 +31,14 @@ package() {
     _archdir=x86
   fi
 
-  #sh ./amd-driver-installer*.run --extract fglrx-install
+  sh ./amd-driver-installer*.run --extract fglrx-install
 
-  #cd fglrx-install
+  cd fglrx-install
   #patch -Np1 -i ../3.5-do_mmap.patch
 
   install -dm755 "${pkgdir}/usr/lib/modprobe.d"
   install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
-  cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+  cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
@@ -47,5 +46,5 @@ package() {
   echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
   
   # license
-  install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+  install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
 }
diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install
index 3adb1410d..655468646 100644
--- a/community-testing/catalyst-dkms/catalyst.install
+++ b/community-testing/catalyst-dkms/catalyst.install
@@ -1,22 +1,18 @@
-post_install() 
-{
-    dkms add -m fglrx -v $1
-    dkms build -m fglrx -v $1
+post_install() {
     dkms install -m fglrx -v $1
 }
 
-post_upgrade() 
-{
-    # removing old version
-    dkms remove -m fglrx -v $2 --all
-    # then installing the new one
-    dkms add -m fglrx -v $1
-    dkms build -m fglrx -v $1
-    dkms install -m fglrx -v $1
+pre_upgrade() {
+    local curver=$2
+    # $2 is unset due to a bug. Query current version using pacman as fallback
+    [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
+    pre_remove $curver
 }
 
-pre_remove() 
-{
-    dkms remove -m fglrx -v $1 --all
+post_upgrade() {
+    post_install $1
 }
 
+pre_remove() {
+    dkms remove -m fglrx -v $1 --all
+}