packages: opera/opera.spec, opera/opera-wrapper.patch - updated to 10.11 (s...

[charles]

Author: charles                      Date: Sat Jun 26 14:59:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 10.11 (stable)

---- Files affected:
packages/opera:
   opera.spec (1.303 -> 1.304) , opera-wrapper.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.303 packages/opera/opera.spec:1.304
--- packages/opera/opera.spec:1.303	Fri Apr 16 10:58:52 2010
+++ packages/opera/opera.spec	Sat Jun 26 16:59:47 2010
@@ -11,9 +11,9 @@
 
 %bcond_without	qt4	#take the qt4 version
 
-%define		ver	10.10
+%define		ver	10.11
 %define		shver	%(echo %{ver} | tr -d .)
-%define		buildid	4742
+%define		buildid	4791
 
 %ifarch ppc
 %undefine	with_qt4
@@ -29,15 +29,15 @@
 License:	Distributable
 Group:		X11/Applications/Networking
 Source10:	ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/i386/shared/%{name}-%{version}.gcc4-shared-qt3.i386.tar.bz2
-# Source10-md5:	c92fb5aa77ecb7afa35a5d26d6d96a8c
+# Source10-md5:	3c6f8dfcd295fb16238437f23b7ffe3c
 Source11:	ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/x86_64/%{name}-%{version}.gcc4-shared-qt3.x86_64.tar.bz2
-# Source11-md5:	ad64dec30bf47ccfb6b6f90c9e1c1e3b
+# Source11-md5:	9d4012dd00d9b4d76ca6d46a4620bbc2
 Source12:	ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/ppc/shared/%{name}-%{version}.gcc4-shared-qt3.ppc.tar.bz2
-# Source12-md5:	d6995d57059bb69b2a509554a70cd677
+# Source12-md5:	0e35bac674be59dee4276bf7182b66b7
 Source13:	ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/i386/%{name}-%{version}.gcc4-qt4.i386.tar.bz2
-# Source13-md5:	b22f377a7a85df3f7a3831fcd2a4b2e4
+# Source13-md5:	825f39f6653fca37dc04b4d0b92797ec
 Source14:	ftp://ftp.opera.com/pub/opera/linux/%{shver}/final/en/x86_64/%{name}-%{version}.gcc4-qt4.x86_64.tar.bz2
-# Source14-md5:	bedd94ab5a663d8e4b694da4772471b4
+# Source14-md5:	1b9ae201cb1df43d3ca291a51d7c7e6c
 Source0:	%{name}.desktop
 Patch0:		%{name}-wrapper.patch
 Patch1:		%{name}-agent-qt4.patch
@@ -257,6 +257,7 @@
 %lang(te) %{_datadir}/opera/locale/te
 %lang(tr) %{_datadir}/opera/locale/tr
 %lang(uk) %{_datadir}/opera/locale/uk
+%lang(vi) %{_datadir}/opera/locale/vi
 %lang(zh_CN) %{_datadir}/opera/locale/zh-cn
 %lang(zh_HK) %{_datadir}/opera/locale/zh-hk
 %lang(zh_TW) %{_datadir}/opera/locale/zh-tw
@@ -282,6 +283,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.304  2010/06/26 14:59:47  charles
+- updated to 10.11 (stable)
+
 Revision 1.303  2010/04/16 08:58:52  jajcus
 - no IcedTeaPlugin.so for opera either
 

================================================================
Index: packages/opera/opera-wrapper.patch
diff -u packages/opera/opera-wrapper.patch:1.5 packages/opera/opera-wrapper.patch:1.6
--- packages/opera/opera-wrapper.patch:1.5	Sat Jan  2 16:22:30 2010
+++ packages/opera/opera-wrapper.patch	Sat Jun 26 16:59:47 2010
@@ -1,18 +1,18 @@
---- opera	2010-01-01 21:34:51.531475131 +0100
-+++ opera	2010-01-02 17:18:27.938275169 +0200
+--- opera-10.11-4791.gcc4-qt4.i386/opera.orig	2010-06-21 16:11:12.000000000 +0200
++++ opera-10.11-4791.gcc4-qt4.i386/opera	2010-06-23 23:16:37.000000000 +0200
 @@ -3,7 +3,7 @@
  # but execute it from the extracted package or current location.
- export LC_ALL=C
+
  # Location of the Opera binaries
 -OPERA_BINARYDIR=usr/lib/opera
 +OPERA_BINARYDIR=/usr/lib/opera
- 
+
  die () {
      for arg
 @@ -37,15 +37,14 @@
  [ -z "$toset" ] || die "Missing parameter for $arg"
- 
- 
+
+
 -[ "$PWD" ] || PWD=`/bin/pwd`
  if [ "$_PERSONALDIR_FROM_CMDLINE_" = NO ]
  then
@@ -20,24 +20,23 @@
 +  OPERA_PERSONALDIR="$HOME/.opera"
    export OPERA_PERSONALDIR
  fi
- 
+
  # Required for Session Management
 -case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/$0;; esac
 +case $0 in /*) OPERA_SCRIPT_PATH=$0;; *) OPERA_SCRIPT_PATH=/usr/bin/$0;; esac
  export OPERA_SCRIPT_PATH
- 
+
  OPERA_SYSTEM_UNAME=`uname -s`
-@@ -56,10 +55,17 @@
+@@ -56,10 +55,16 @@
  [ -f "$OPERA_BINARYDIR/opera" ] || die "The Opera binary is not located at \"$OPERA_BINARYDIR/opera\"." "Please modify the wrapper script at \"$0\"."
  [ -x "$OPERA_BINARYDIR/opera" ] || die "You do not have execute rights on \"$OPERA_BINARYDIR/opera\", please ask the sysadmin to chmod +x it."
- 
+
 +# set JAVA_HOME from jpackage-utils if available
 +if [ -f /usr/share/java-utils/java-functions ]; then
 +    . /usr/share/java-utils/java-functions
 +    set_jvm
 +fi
 +
-+
  # Opera enviroment
  if [ -z "$OPERA_DIR" ]
  then
@@ -45,13 +44,13 @@
 +    OPERA_DIR="/usr/share/opera"
  fi
  export OPERA_DIR
- 
-@@ -357,7 +363,7 @@
- 
+
+@@ -357,7 +362,7 @@
+
  # Setting environment relative to current working directory
  # Bundled Qt will be found here unless preloaded by the stance above
 -LD_LIBRARY_PATH="$PWD/usr/lib/opera${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
 +LD_LIBRARY_PATH="$OPERA_BINARYDIR/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
  export LD_LIBRARY_PATH
- 
+
  # Run Opera:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.303&r2=1.304&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-wrapper.patch?r1=1.5&r2=1.6&f=u