multimedia/flash-player-plugin: Updated for version 11.0.1.152.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

3 files changed, 22 insertions, 15 deletions

diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
index a9ddfdee25..e0f00f1dd9 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
@@ -21,11 +21,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flash-player-plugin
-VERSION=11_rc1
-DATESTAMP=090611
+VERSION=11.0.1.152
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+VERS_MAJ=$(printf $VERSION | cut -d. -f1)
+
 case "$( uname -m )" in
   i?86) ARCH=i386 ;;
   arm*) ARCH=arm ;;
@@ -34,10 +35,8 @@ esac
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-  SRC_ARCH=64
 elif [ "$ARCH" = "i386" ]; then
   LIBDIRSUFFIX=""
-  SRC_ARCH=32
 else
   printf "\n\n$ARCH is unsupported...\n"
   exit 1
@@ -54,8 +53,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-tar xvf $CWD/flashplayer${VERSION}_install_lin_${SRC_ARCH}_${DATESTAMP}.tar.gz -C $PKG
-[ "$SRC_ARCH" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib64
+tar xf $CWD/install_flash_player_${VERS_MAJ}_linux.${ARCH}.tar.gz -C $PKG
+[ "$ARCH" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib64
+
+if ! strings $PKG/libflashplayer.so | grep -wq "^${VERSION}$" 2>/dev/null ; then
+  printf "\n\tThis script is written for version $VERSION of the plugin,\n"
+  printf "\tbut you don't seem to have that version.  This is likely\n"
+  printf "\tokay, and it's almost surely not your fault - Adobe tends\n"
+  printf "\tto release new tarballs without changing the name.\n\n"
+  sleep 10
+fi
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 mv $PKG/libflashplayer.so $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
diff --git a/multimedia/flash-player-plugin/flash-player-plugin.info b/multimedia/flash-player-plugin/flash-player-plugin.info
index 99049c50b3..1c393cd3a2 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.info
+++ b/multimedia/flash-player-plugin/flash-player-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="flash-player-plugin"
-VERSION="11_rc1"
+VERSION="11"
 HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
-DOWNLOAD="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_rc1_install_lin_32_090611.tar.gz"
-MD5SUM="2a780926255d88f39f3b007f3d342e0d"
-DOWNLOAD_x86_64="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_rc1_install_lin_64_090611.tar.gz"
-MD5SUM_x86_64="fd9bea881552223ddd73ccd84d2cd459"
+DOWNLOAD="http://fpdownload.macromedia.com/get/flashplayer/pdc/11.0.1.152/install_flash_player_11_linux.i386.tar.gz"
+MD5SUM="34051edfcb78e6db14567a6c5f53e161"
+DOWNLOAD_x86_64="http://fpdownload.macromedia.com/get/flashplayer/pdc/11.0.1.152/install_flash_player_11_linux.x86_64.tar.gz"
+MD5SUM_x86_64="782952c5730caa4e4cbe7e1d9dfa6214"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/multimedia/flash-player-plugin/slack-desc b/multimedia/flash-player-plugin/slack-desc
index 125c82471a..45515b8f77 100644
--- a/multimedia/flash-player-plugin/slack-desc
+++ b/multimedia/flash-player-plugin/slack-desc
@@ -12,8 +12,8 @@ flash-player-plugin: Provides Adobe Flash plugin for browsers that recognize
 flash-player-plugin: /usr/lib(64)/mozilla/plugins as a valid plugin directory
 flash-player-plugin:
 flash-player-plugin: Plugin is subject to Adobe terms of use:
-flash-player-plugin:  http://www.adobe.com/go/labs_term_of_use
-flash-player-plugin: Plugin is subject to Adobe Flash EULA:
-flash-player-plugin:  http://labs.adobe.com/technologies/eula/flashplayer.html
+flash-player-plugin:  https://www.adobe.com/misc/terms.html
+flash-player-plugin:
+flash-player-plugin:
 flash-player-plugin:
 flash-player-plugin: