network/opera: Updated for version 10.60.

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

5 files changed, 31 insertions, 77 deletions

diff --git a/network/opera/doinst.sh b/network/opera/doinst.sh
index 08d7e7e957..9830478e8c 100644
--- a/network/opera/doinst.sh
+++ b/network/opera/doinst.sh
@@ -1,21 +1,9 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/operaprefs_default.ini.new
-config etc/operaprefs_fixed.ini.new
-
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
diff --git a/network/opera/fixup_libdir.diff b/network/opera/fixup_libdir.diff
new file mode 100644
index 0000000000..1f9b4e7c92
--- /dev/null
+++ b/network/opera/fixup_libdir.diff
@@ -0,0 +1,8 @@
+diff -Nur opera.orig//usr/bin/opera opera/usr/bin/opera
+--- opera.orig//usr/bin/opera	2010-06-30 06:40:32.000000000 -0500
++++ opera/usr/bin/opera	2010-07-02 01:47:52.640586985 -0500
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ export OPERA_DIR=${OPERA_DIR:-/usr/share/opera}
+-exec /usr/lib/opera/opera "$@"
++exec /usr/lib64/opera/opera "$@"
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 797bc0a4fb..c99dbc9ca9 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for opera
 
 # Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2008,2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,16 +24,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opera
-VERSION=10.10
+VERSION=10.60
+REVNO=6386
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i386 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,66 +53,25 @@ else
   exit 1
 fi
 
-# Don't bother this - it's for easier manipulation and sed'ing later
-TOPDIR=$(tar tf $CWD/$PRGNAM-${VERSION}.gcc4-qt4.${ARCH}.tar.bz2 |head -1)
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
-rm -rf $TOPDIR
-tar xvf $CWD/$PRGNAM-${VERSION}.gcc4-qt4.${ARCH}.tar.bz2
-cd $TOPDIR
+cd $PKG
+rm -rf $PRGNAM-${VERSION}-${REVNO}.${ARCH}
+rpm2cpio < $CWD/$PRGNAM-${VERSION}-${REVNO}.${ARCH}.rpm | cpio -imdv
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# No, the --DESTDIR isn't documented.  In fact, the presence of OPERADESTDIR
-# at the top of install.sh is damn misleading.  I shouldn't have to actually
-# read the install script to figure out DESTDIR: the --help should show it.
-# --rworkman
-./install.sh \
-  --prefix=/usr \
-  --exec_prefix=/usr/lib${LIBDIRSUFFIX}/opera \
-  --sharedir=/usr/share/opera \
-  --wrapperdir=/usr/bin \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/opera-$VERSION \
-  --plugindir=/usr/lib${LIBDIRSUFFIX}/mozilla/plugins \
-  --DESTDIR=$PKG
-
-# Fix a potential security issue (minor, but still) with a hardcoded path to
-# the build directory lingering in /usr/bin/opera
-# Theoretically, a malicious user looks at that in /usr/bin/opera and later
-# recreates the directory and does some unknown havoc.  It may very well be
-# completely safe and unexploitable and I'm just being Chicken Little here,
-# but it's easy enough to fix and I'd rather be safe than sorry.  --rworkman
-sed -i "s%$TMP/$TOPDIR\$0%\$PWD/\${0#./}%g" $PKG/usr/bin/opera
+[ "$LIBDIRSUFFIX" = "64" ] && patch -p1 < $CWD/fixup_libdir.diff
+[ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
 
-#  /usr/bin/opera doesn't look in the right places for 64bit java. Fix it.
-if [ "$ARCH" = "x86_64" ]; then
-sed -i -e "/PREFIXES=\"/,/\/opt\"/ s:/usr/lib:/usr/lib64:" \
-       -e "s:i386:amd64:" $PKG/usr/bin/opera
-fi
-
-# Include config files
-mv etc $PKG
-mv $PKG/etc/operaprefs_default.ini $PKG/etc/operaprefs_default.ini.new
-mv $PKG/etc/operaprefs_fixed.ini $PKG/etc/operaprefs_fixed.ini.new
-
-# Add an opera.desktop file and link the icon to /usr/share/pixmaps
-mv usr/share/icons usr/share/pixmaps $PKG/usr/share
-mkdir -p $PKG/usr/share/applications
-cat $CWD/opera.desktop > $PKG/usr/share/applications/opera.desktop
+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 )
 # Add a copy of the build script to the docs
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Compress the man page
-gzip -9 $PKG/usr/man/man?/*.?
-
-# Strip symbols we don't need
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/opera/opera.info b/network/opera/opera.info
index cdfff79c99..62f3ca4271 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="10.10"
+VERSION="10.60"
 HOMEPAGE="http://www.opera.com"
-DOWNLOAD="http://ftp.ussg.iu.edu/opera/linux/1010/final/en/i386/opera-10.10.gcc4-qt4.i386.tar.bz2"
-MD5SUM="b22f377a7a85df3f7a3831fcd2a4b2e4"
-DOWNLOAD_x86_64="http://ftp.ussg.iu.edu/opera/linux/1010/final/en/x86_64/opera-10.10.gcc4-qt4.x86_64.tar.bz2"
-MD5SUM_x86_64="bedd94ab5a663d8e4b694da4772471b4"
+DOWNLOAD="ftp://ftp.opera.com/pub/opera/linux/1060/opera-10.60-6386.i386.rpm"
+MD5SUM="cf02a54ecfbcef936a93b2b0157fe1b0"
+DOWNLOAD_x86_64="ftp://ftp.opera.com/pub/opera/linux/1060/opera-10.60-6386.x86_64.rpm"
+MD5SUM_x86_64="3b90ca4956bf36f51ad85b8588364034"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Erik Hanson"
diff --git a/network/opera/slack-desc b/network/opera/slack-desc
index 45b76c67af..5a7661cebe 100644
--- a/network/opera/slack-desc
+++ b/network/opera/slack-desc
@@ -7,7 +7,7 @@
 
      |-----handy-ruler--------------------------------------------------------|
 opera: opera (Opera Web Browser)
-opera: 
+opera:
 opera: Opera is a lightweight, free, multiplatform, and
 opera: standards-compliant web browser.
 opera: