multimedia/flash-player-plugin: Changed to version 10.2_r153.

This is the release version of the 32bit plugin, so we'll use that
as our official VERSION string.  No changes on the 64bit side.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

2 files changed, 14 insertions, 27 deletions

diff --git a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
index d46d1a210cc5..a3fb21e0dd27 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
+++ b/multimedia/flash-player-plugin/flash-player-plugin.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010,2011  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flash-player-plugin
-VERSION=10.3_d162
-BUILD=${BUILD:-2}
+VERSION=10.2_r153
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-SRC_VERSION=111710
-
 case "$( uname -m )" in
   i?86) ARCH=i386 ;;
   arm*) ARCH=arm ;;
@@ -36,12 +34,9 @@ esac
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
   SRC_ARCH=64bit
-  PLEV=p3
 elif [ "$ARCH" = "i386" ]; then
   LIBDIRSUFFIX=""
   SRC_ARCH=32bit
-  VERSION=10.2_d151
-  PLEV=p2
 else
   printf "\n\n$ARCH is unsupported...\n"
   exit 1
@@ -58,24 +53,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-tar xf $CWD/flashplayer10_2_${PLEV}_${SRC_ARCH}_linux_${SRC_VERSION}.tar.gz
-
-# Check to make sure we're packaging the same version that this script
-# was written to handle:
-_REALVERS=$(strings libflashplayer.so | grep -e "^Shockwave Flash [.\d+]*" | sed -e "s/Shockwave Flash //g")
-if [ ! "$(echo $_REALVERS | tr ' ' _)" = "$(echo $VERSION)" ]; then
-  echo
-  echo "This build script was written for a different version of the"
-  echo "flash plugin than you have downloaded.  This is probably due"
-  echo "to Adobe changing the upstream tarball - they don't have"
-  echo "versioned tarballs - and it's almost certainly nothing to be"
-  echo "concerned about.  However, if this package doesn't build or"
-  echo "work as expected, contact the SlackBuilds.org project on our"
-  echo "users mailing list."
-  echo
-  sleep 5
+if [ "$SRC_ARCH" = "32bit" ];then
+  tar xf $CWD/install_flash_player_10_linux.tar.gz
+elif [ "$SRC_ARCH" = "64bit" ]; then
+  tar xf $CWD/flashplayer10_2_p3_64bit_linux_111710.tar.gz
 fi
 
+# Adobe's versioning scheme is maddening...
+REALVERS=$(strings libflashplayer.so | grep -e "^Shockwave Flash [.\d+]*" | sed -e "s/Shockwave Flash //g")
+VERSION=$(echo "$REALVERS" | tr ' ' _)
+
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
 install -m 0755 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 f3ca93ca7f9e..37dff5734cf4 100644
--- a/multimedia/flash-player-plugin/flash-player-plugin.info
+++ b/multimedia/flash-player-plugin/flash-player-plugin.info
@@ -1,8 +1,8 @@
 PRGNAM="flash-player-plugin"
-VERSION="10.3_d162"
+VERSION="10.2_r153"
 HOMEPAGE="http://labs.adobe.com/technologies/flashplayer10/"
-DOWNLOAD="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_111710.tar.gz"
-MD5SUM="3a5c1e0a77bb44d3456c933a056bcf47"
+DOWNLOAD="http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz"
+MD5SUM="d9765217326bdca56d6a5b9030e8c574"
 DOWNLOAD_x86_64="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz"
 MD5SUM_x86_64="49b55c7eb8044453e5f6f2e4b3cb4084"
 MAINTAINER="Robby Workman"