From 126d4e0140bf24132eb35ab8fc19f01dcacf8589 Mon Sep 17 00:00:00 2001
From: vvoody
Date: Sun, 1 Apr 2012 23:10:41 -0500
Subject: network/opera: Updated for 11.62.

Thanks to Ruarí Ødegaard for some help here too :)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/opera/opera.SlackBuild | 33 +++++++++++++++++++--------------
 network/opera/opera.info       | 10 +++++-----
 2 files changed, 24 insertions(+), 19 deletions(-)

(limited to 'network/opera')

diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 135597c71d..d6d4191e17 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -26,14 +26,14 @@
 # Now maintained by vvoody <vvoodywang@gmail.com>
 
 PRGNAM=opera
-VERSION=11.61
-REVNO=1250
+VERSION=11.62
+REVNO=1347
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +48,10 @@ set -eu
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "i386" ]; then
+  OARCH=$ARCH
+elif [ "$ARCH" = "i686" ]; then
   LIBDIRSUFFIX=""
+  OARCH=i386
 else
   printf "\n\n$ARCH is not supported...\n"
   exit 1
@@ -58,9 +60,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux
-tar xf $CWD/$PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux.tar.xz
-cd $PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux
+rm -rf $PRGNAM-${VERSION}-${REVNO}.${OARCH}.linux
+tar xf $CWD/$PRGNAM-${VERSION}-${REVNO}.${OARCH}.linux.tar.xz
+cd $PRGNAM-${VERSION}-${REVNO}.${OARCH}.linux
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -68,15 +70,18 @@ chmod -R u+w,go+r-w,a-s .
   --prefix /usr \
   --repackage $PKG/usr
 
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib64
-  sed -i "s,/lib/,/lib64/," $PKG/usr/bin/opera
+if [ -n "$LIBDIRSUFFIX" ]; then
+  mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+  sed -i "s,/lib/,/lib$LIBDIRSUFFIX/," $PKG/usr/bin/$PRGNAM
 fi
 
-mv $PKG/usr/share/man $PKG/usr
-mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/opera $PKG/usr/doc/opera-$VERSION
-( cd $PKG/usr/doc ; ln -s opera-$VERSION opera )
+mv $PKG/usr/share/{man,doc} $PKG/usr
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/${PRGNAM}-$VERSION
+if [ -f "$PKG/usr/doc/${PRGNAM}-$VERSION/LICENSE" ]; then
+  find $PKG/usr/share/$PRGNAM/{defaults,locale/en*} -name license.txt -type l -delete
+  mv $PKG/usr/doc/${PRGNAM}-$VERSION/LICENSE $PKG/usr/share/$PRGNAM/defaults/license.txt
+  ( cd $PKG/usr/doc/${PRGNAM}-$VERSION/ ; ln -s ../../share/$PRGNAM/defaults/license.txt LICENSE )
+fi
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/opera/opera.info b/network/opera/opera.info
index 860036d202..b654bb8edb 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="11.61"
+VERSION="11.62"
 HOMEPAGE="http://www.opera.com"
-DOWNLOAD="http://ftp.opera.com/pub/opera/linux/1161/opera-11.61-1250.i386.linux.tar.xz"
-MD5SUM="36896d9722f173754fb2945d7c06d7dd"
-DOWNLOAD_x86_64="http://ftp.opera.com/pub/opera/linux/1161/opera-11.61-1250.x86_64.linux.tar.xz"
-MD5SUM_x86_64="424bff342dc5e9225cd573e50d49552a"
+DOWNLOAD="http://ftp.opera.com/pub/opera/linux/1162/opera-11.62-1347.i386.linux.tar.xz"
+MD5SUM="82101892dde8660c6eececdfca08e34d"
+DOWNLOAD_x86_64="http://ftp.opera.com/pub/opera/linux/1162/opera-11.62-1347.x86_64.linux.tar.xz"
+MD5SUM_x86_64="e65bd458aa2c0106cbd51f7ecd92dce7"
 MAINTAINER="vvoody"
 EMAIL="vvoodywang@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3