setup java home, it's autodetect gets things wrong

diff --git a/java-home.patch b/java-home.patch
new file mode 100644 (file)
index 0000000..def1695
--- /dev/null
+++ b/java-home.patch
@@ -0,0 +1,24 @@
+--- oracle-sqldeveloper-4.0.1.14.48/sqldeveloper/sqldeveloper/bin/sqldeveloper~        2014-04-25 23:47:57.000000000 +0300
++++ oracle-sqldeveloper-4.0.1.14.48/sqldeveloper/sqldeveloper/bin/sqldeveloper 2014-04-26 02:01:05.490507412 +0300
+@@ -109,4 +109,11 @@
+     echo "`GetUserHomeDirName`"
+ }
+ 
++# set JAVA_HOME from jpackage-utils if available
++if [ -z "$JAVA_HOME" ] && [ -f /usr/share/java-utils/java-functions ]; then
++      . /usr/share/java-utils/java-functions
++      set_jvm
++fi
++OIDE_JAVA_HOME=$JAVA_HOME
++
+ LaunchIDE "$@"
+--- oracle-sqldeveloper-4.0.1.14.48/sqldeveloper/sqldeveloper/bin/sqldeveloper.conf~   2014-04-25 23:47:57.000000000 +0300
++++ oracle-sqldeveloper-4.0.1.14.48/sqldeveloper/sqldeveloper/bin/sqldeveloper.conf    2014-04-26 02:01:20.711174342 +0300
+@@ -1,6 +1,6 @@
+ IncludeConfFile ../../ide/bin/ide.conf
+ 
+-SetJavaHome ../../jdk
++#SetJavaHome ../../jdk
+ 
+ #Set our usage tracking URI
+ AddVMOption  -Dide.update.usage.servers=http://www.oracle.com/webfolder/technetwork/sqldeveloper/usage.xml

diff --git a/oracle-sqldeveloper.spec b/oracle-sqldeveloper.spec
index 96898ae566efce43cd1f0dfdc0baaa75c36cc6c1..ac7efb11260c8163dd927196f475c697018bcc26 100644 (file)
--- a/oracle-sqldeveloper.spec
+++ b/oracle-sqldeveloper.spec
@@ -1,7 +1,7 @@
 Summary:       Oracle SQL Developer
 Name:          oracle-sqldeveloper
 Version:       4.0.1.14.48
-Release:       0.3
+Release:       0.4
 License:       OTN (proprietary, non-distributable)
 Group:         Applications/Databases
 Source0:       http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-%{version}-1.noarch.rpm
@@ -9,7 +9,10 @@ Source0:       http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-%{version
 URL:           http://www.oracle.com/technetwork/developer-tools/sql-developer/
 BuildRequires: rpm-utils
 Patch0:                desktop.patch
+Patch1:                java-home.patch
 Requires:      desktop-file-utils
+Requires:      jpackage-utils
+Requires:      jre
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,6 +44,7 @@ rm sqldeveloper/sqldeveloper/bin/SQLDeveloperIcons.icns
 rm sqldeveloper/view-source-paths.lis
 
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT