- weekly 628

[packages/opera.git] / opera.spec

diff --git a/opera.spec b/opera.spec
index 4d40a9cdd071842bb26fa71bc4401dd004e5b146..1a1d0e8179d30688b7c92a9be09372d2ca27dd56 100644 (file)
--- a/opera.spec
+++ b/opera.spec
@@ -7,7 +7,7 @@
 %bcond_with    snap            # snap version
 %bcond_with    weekly          # weekly snapshot version
 
-%ifarch sparc64 sparc
+%ifarch sparc sparc64
 %undefine with_shared
 %endif
 
@@ -15,8 +15,8 @@
 %define        ver             9.20
 %define        sver            %{ver}
 %define        fix             %{nil}
-%define        dirrel          20070202
-%define        magicstr        557
+%define        dirrel          20070330
+%define        magicstr        628
 %define with_snap      1
 %else
 %if %{with snap}
@@ -47,23 +47,25 @@
 %define        type            shared
 # We should be able to build src.rpm also on not supported archs
 %define        rel             %{x86_shared_rel}
-%ifarch sparc64 sparc
+%ifarch sparc sparc64
 #%%define      rel             %{sparc_shared_rel}
 %define        rel             %{sparc_static_rel}
-%endif
+%else
 %ifarch ppc
 %define        rel             %{ppc_shared_rel}
 %endif
+%endif
 %else
 %define        type            static
 %define        rel             %{x86_static_rel}
 %ifarch sparc sparc64
 %define        rel             %{sparc_static_rel}
-%endif
+%else
 %ifarch ppc
 %define        rel             %{ppc_static_rel}
 %endif
 %endif
+%endif
 
 # define to 0 and then redefine to avoid
 # not defined macros
@@ -140,8 +142,8 @@
 #                              with shared;    [endif]
 %endif
 #                      with snap;      [endif]
-%endif
-#              is ix86;        [endif]
+%else
+#              is ix86:        [else]
 %ifarch        sparc sparc64
 #              is sparc?       [if]
 %if    %{with snap}
@@ -167,8 +169,8 @@
 #                              with shared;    [endif]
 %endif
 #                      with snap;      [endif]
-%endif
-#              is sparc;       [endif]
+%else
+#              is sparc:       [else]
 %ifarch        ppc
 #              is ppc?         [if]
 %if    %{with snap}
@@ -190,12 +192,16 @@
 #                              with shared:    [else]
 %define        need_ppc_static 1
 %endif
-#                              with shared;    [endif
+#                              with shared;    [endif]
 %endif
-#                      with snap;      [endif
+#                      with snap;      [endif]
 %endif
 #              is ppc;         [endif]
 %endif
+#              is sparc;       [endif]
+%endif
+#              is ix86;        [endif]
+%endif
 #      with incall;    [endif]
 
 %if %{with weekly}
@@ -266,7 +272,7 @@ Source20:   ftp://ftp.opera.com/pub/opera/linux/%{shver}/%{reltype}/en/i386/shared
 %if %{need_ix86_shared_snap}
 %if %{with weekly}
 Source301020:  http://snapshot.opera.com/unix/Weekly-%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en-%{magicstr}.tar.bz2
-# Source301020-md5:    37e059f068f00f8f76dab00d39dad784
+# Source301020-md5:    232b0111e9b9c0a7266c66776f597ba5
 %else
 Source1020:    http://snapshot.opera.com/unix/%{ver}-%{reltype}/%{magicstr}/intel-linux/%{name}-%{sver}-%{x86_shared_rel}-shared-qt.i386-en.tar.bz2
 # Source1020-md5:      6f296be6b9fc3001588d4509016062bd
@@ -349,6 +355,9 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_sysconfdir}}
 
 # use mplayerplug-in-opera instead
 mplayerplug-in*
+
+# opera uses libjava.so to run java
+libjavaplugin_oji.so
 EOF
 
 sh install.sh \