[josm/f13/master] Solve Bug 641756 - JOSM chooses wrong Java version on startup

[Cédric OLIVIER]

commit a282d3f726d555d52c1b4396c28fd324314593d7
Author: cquad <cquad at fedoraproject.org>
Date:   Fri Nov 19 22:54:19 2010 +0100

    Solve Bug 641756 - JOSM chooses wrong Java version on startup

 josm      |    5 ++++-
 josm.spec |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/josm b/josm
index 30b7b35..918bae4 100644
--- a/josm
+++ b/josm
@@ -1,6 +1,9 @@
-#!/bin/sh
+#!/bin/sh 
 # Simple wrapper script used to start JOSM
 
+# to prefer jre version and not java-devel version
+_prefer_jre=1
+
 # Source functions library
 if [ -f /usr/share/java-utils/java-functions ] ; then
   . /usr/share/java-utils/java-functions
diff --git a/josm.spec b/josm.spec
index 45e7474..65afb87 100644
--- a/josm.spec
+++ b/josm.spec
@@ -6,7 +6,7 @@
 
 Name:           josm
 Version:        0
-Release:        0.11.%{svn_revision}svn%{?dist}
+Release:        0.12.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -142,6 +142,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Nov 19 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.12.3592svn
+- Solve Bug 641756 - JOSM chooses wrong Java version on startup
+
 * Tue Oct 07 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.11.3592svn
 - Update to 3592 svn revision