From 4a1d1bd24211726c3eab0bb44b3916a96987737b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 1 Dec 2006 16:46:08 +0000
Subject: [PATCH] - conditionally use jpackage-utils (thx arekm for pointing it
 out)

Changed files:
    opera-wrapper.patch -> 1.2
---
 opera-wrapper.patch | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/opera-wrapper.patch b/opera-wrapper.patch
index 23d48be..7e69a6c 100644
--- a/opera-wrapper.patch
+++ b/opera-wrapper.patch
@@ -1,6 +1,6 @@
---- opera-9.02-20060919.5-shared-qt.i386-en-434/install.sh~	2006-09-19 17:04:07.000000000 +0300
-+++ opera-9.02-20060919.5-shared-qt.i386-en-434/install.sh	2006-11-30 17:28:06.433528740 +0200
-@@ -843,13 +843,17 @@
+--- opera-9.02-20060919.5-shared-qt.i386-en-434/install.sh~	2006-12-01 18:43:27.800063859 +0200
++++ opera-9.02-20060919.5-shared-qt.i386-en-434/install.sh	2006-12-01 18:44:24.201331154 +0200
+@@ -843,13 +843,19 @@
      wrapper_contain="#!/bin/sh
  
  # Required for Session Management
@@ -12,9 +12,11 @@
  OPERA_BINARYDIR=${str_localdirexec}
  export OPERA_BINARYDIR
  
-+# set JAVA_HOME
-+. /usr/share/java-utils/java-functions
-+set_jvm
++# 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
 +
  # Parse commandline parameters
  toset=
-- 
2.44.0