packages (DEVEL): opera/opera.spec - up to 6219; java plugin is now used

[arekm]

Author: arekm                        Date: Thu Feb 11 09:48:43 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 6219; java plugin is now used

---- Files affected:
packages/opera:
   opera.spec (1.246.2.74.2.30 -> 1.246.2.74.2.31) 

---- Diffs:

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.30 packages/opera/opera.spec:1.246.2.74.2.31
--- packages/opera/opera.spec:1.246.2.74.2.30	Mon Feb  1 12:26:28 2010
+++ packages/opera/opera.spec	Thu Feb 11 10:48:37 2010
@@ -11,7 +11,7 @@
 
 %define	ver		10.50
 %define	reltype		snapshot
-%define	magicstr	6204
+%define	magicstr	6219
 
 %define		_rel	1
 Summary:	World fastest web browser
@@ -23,12 +23,12 @@
 License:	Distributable
 Group:		X11/Applications/Networking
 
-Source0:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.linux.i386.tar.bz2
-# Source0-md5:	9c53e8bd447f8d4bb35ba3d1989aa0ac
+Source0:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.i386.linux.tar.bz2
+# Source0-md5:	351a4eb5da64ac601f9f420f266b9ca4
 %{!?with_distributable:NoSource:	0}
 
-Source1:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.linux.x86_64.tar.bz2
-# Source1-md5:	c23b432302fb06f7f1a4be049f326223
+Source1:	http://snapshot.opera.com/unix/snapshot-%{magicstr}/%{name}-%{ver}-%{magicstr}.x86_64.linux.tar.bz2
+# Source1-md5:	adfe0766c762eb01a4cd18a3c87edcbf
 %{!?with_distributable:NoSource:	1}
 
 Source4:	%{name}.desktop
@@ -70,11 +70,11 @@
 
 %prep
 %ifarch %{ix86}
-%setup -q -T -b0 -n %{name}-%{ver}-%{magicstr}.linux.i386
+%setup -q -T -b0 -n %{name}-%{ver}-%{magicstr}.i386.linux
 %endif
 
 %ifarch %{x8664}
-%setup -q -T -b1 -n %{name}-%{ver}-%{magicstr}.linux.x86_64
+%setup -q -T -b1 -n %{name}-%{ver}-%{magicstr}.x86_64.linux
 %endif
 
 %patch0 -p0
@@ -89,9 +89,6 @@
 
 # use mplayerplug-in-opera instead
 mplayerplug-in*
-
-# opera uses libjava.so to run java
-libjavaplugin_oji.so
 EOF
 
 install opera $RPM_BUILD_ROOT%{_bindir}
@@ -137,7 +134,6 @@
 %{_datadir}/opera/*.*
 %{_datadir}/opera/defaults
 %{_datadir}/opera/extra
-%{_datadir}/opera/java
 %{_datadir}/opera/skin
 #%{_datadir}/opera/scripts
 %{_datadir}/opera/styles
@@ -204,6 +200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.31  2010/02/11 09:48:37  arekm
+- up to 6219; java plugin is now used
+
 Revision 1.246.2.74.2.30  2010/02/01 11:26:28  arekm
 - up to 6204
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.30&r2=1.246.2.74.2.31&f=u