4 files changed, 21 insertions, 21 deletions
diff --git a/development/amd-app-sdk/README b/development/amd-app-sdk/README
index b3a485aa78176..3a3aeb6d3b805 100644
--- a/development/amd-app-sdk/README
+++ b/development/amd-app-sdk/README
@@ -1,16 +1,13 @@
 AMD APP (formerly ATI Stream) technology is a set of advanced hardware and
-software technologies that enable AMD graphics processing cores (GPU), working
-in concert with the system's x86 cores (CPU), to accelerate many applications
-beyond just graphics.
+software technologies that enable AMD graphics processing cores (GPU),
+working in concert with the system's x86 cores (CPU), to accelerate many
+applications beyond just graphics.
 
-This is AMD's impementation of OpenCL on top of Radeon hardware. You'll need a
-compatible card and recent Catalyst drivers. See 
+This is AMD's implementation of OpenCL on top of Radeon hardware. You'll
+need a compatible card and recent Catalyst drivers. See 
 http://developer.amd.com/sdks/AMDAPPSDK/pages/DriverCompatibility.aspx 
 for a complete list of requirements.
 
-NOTES:
+NOTE:
 
 This package is compatible only with x86 and x86_64 architectures.
-
-The download links point to a license agreement page. If you agree to that
-license, you'll then be able to download the files.
diff --git a/development/amd-app-sdk/amd-app-sdk.SlackBuild b/development/amd-app-sdk/amd-app-sdk.SlackBuild
index 6fde5d7e0db5b..23f9ead60e542 100644
--- a/development/amd-app-sdk/amd-app-sdk.SlackBuild
+++ b/development/amd-app-sdk/amd-app-sdk.SlackBuild
@@ -26,11 +26,12 @@
 #
 # Build history:
 #
-# 1 - Initial release.
+# Initial release.
+# 20121220 - Updated for version 2.6: incompatible packaging with 2.4- versions
 
 PRGNAM=amd-app-sdk
 INT_NAME=AMD-APP-SDK
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,15 +51,17 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 ARCHIVE_NAME="AMD-APP-SDK-v$VERSION-lnx${BITNESS}"
+INT_ARCHIVE_NAME="AMD-APP-SDK-v$VERSION-RC3-lnx${BITNESS}"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $ARCHIVE_NAME
+rm -rf $INT_ARCHIVE_NAME
 tar xvf $CWD/$ARCHIVE_NAME.tgz
-cd $ARCHIVE_NAME
+tar xvf $INT_ARCHIVE_NAME.tgz
+cd $INT_ARCHIVE_NAME
 
 # If we're packaging a 64 bit package, let's remove all 32 bit parts first (no multilib).
 # RFC: should all these files really be removed, given that the user already downloaded them in the
@@ -87,7 +90,7 @@ mv * $PKG/opt/$PRGNAM
 
 # Install the icd registration tarball into $PKG root
 
-( cd $PKG && tar xf $PKG/opt/$PRGNAM/icd-registration.tgz )
+( cd $PKG && tar xf $TMP/icd-registration.tgz )
 
 # Copy the profile scripts in their final location...
 
diff --git a/development/amd-app-sdk/amd-app-sdk.info b/development/amd-app-sdk/amd-app-sdk.info
index d2b07b83dc173..a9b6eb5e6101c 100644
--- a/development/amd-app-sdk/amd-app-sdk.info
+++ b/development/amd-app-sdk/amd-app-sdk.info
@@ -1,10 +1,10 @@
 PRGNAM="amd-app-sdk"
-VERSION="2.4"
+VERSION="2.6"
 HOMEPAGE="http://developer.amd.com/sdks/AMDAPPSDK/Pages/default.aspx"
-DOWNLOAD="http://developer.amd.com/Downloads/AMD-APP-SDK-v2.4-lnx32.tgz"
-MD5SUM="f7b1c093136ee922f6e1a752949e92ef"
-DOWNLOAD_x86_64="http://developer.amd.com/Downloads/AMD-APP-SDK-v2.4-lnx64.tgz"
-MD5SUM_x86_64="23f141a07401ce2d617082460cf18ee0"
+DOWNLOAD="http://developer.amd.com/Downloads/AMD-APP-SDK-v2.6-lnx32.tgz"
+MD5SUM="0a0ecedcc98a37428cc3ab090b8cf6b7"
+DOWNLOAD_x86_64="http://developer.amd.com/Downloads/AMD-APP-SDK-v2.6-lnx64.tgz"
+MD5SUM_x86_64="935f3490d1e3aac1bb6b3472488ead93"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
-APPROVED="Erik Hanson"
+APPROVED="Erik Hanson,Niels Horn"
diff --git a/development/amd-app-sdk/slack-desc b/development/amd-app-sdk/slack-desc
index 372f98f654969..833dc29d412bc 100644
--- a/development/amd-app-sdk/slack-desc
+++ b/development/amd-app-sdk/slack-desc
@@ -5,7 +5,7 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-           |----handy-ruler--------------------------------------------------------|
+           |----handy-ruler-------------------------------------------------------|
 amd-app-sdk: amd-app-sdk (AMD Accelerated Parallel Processing SDK)
 amd-app-sdk:
 amd-app-sdk: The AMD APP Software Development Kit (SDK) is a complete development