rpms/jpackage-utils/devel jpackage-utils-prefer-jre.patch, NONE, 1.1 jpackage-utils.spec, 1.50, 1.51

[Deepak Bhole]

Author: dbhole

Update of /cvs/pkgs/rpms/jpackage-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22671

Modified Files:
	jpackage-utils.spec 
Added Files:
	jpackage-utils-prefer-jre.patch 
Log Message:

- Stopgap fix for rhbz#461683 from Ville Skyttä.



jpackage-utils-prefer-jre.patch:
 java-utils/java-functions |   23 +++++++++++++++++++++--
 misc/macros.jpackage      |    2 ++
 2 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE jpackage-utils-prefer-jre.patch ---
--- jpackage-utils-1.7.5/java-utils/java-functions	2008-04-01 20:57:42.000000000 +0300
+++ jpackage-utils-1.7.5/java-utils/java-functions	2009-05-04 19:53:21.000000000 +0300
@@ -24,11 +24,26 @@ fi
 [ ! -z "$_JAVA_HOME" -a -d "$_JAVA_HOME" ] && JAVA_HOME="$_JAVA_HOME"
 
 # Test default JRE/JVM roots if nothing is defined yet
-[ -z "$JAVA_HOME" -a -d "$JVM_ROOT/java" ] && JAVA_HOME="$JVM_ROOT/java"
-[ -z "$JAVA_HOME" -a -d "$JVM_ROOT/jre" ] && JAVA_HOME="$JVM_ROOT/jre"
+_set_java_home() {
+  if [ -z "$JAVA_HOME" ] ; then
+    local _java_dirs="java"
+    case "$_prefer_jre" in
+      1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) _java_dirs="jre $_java_dirs" ;;
+      *)                               _java_dirs="$_java_dirs jre" ;;
+    esac
+    for d in $_java_dirs ; do
+      if [ -d "$JVM_ROOT/$d" ] ; then
+        JAVA_HOME="$JVM_ROOT/$d"
+        break
+      fi
+    done
+  fi
+}
 
 # Set the java virtual machine
 set_jvm() {
+  _set_java_home
+
   # use $JAVA_HOME if defined
   if [ -n "$JAVA_HOME" ] ; then
     return
@@ -60,6 +75,8 @@ set_jvm() {
 # Set the classpath
 # This requires a valid JAVA_HOME, JAVACMD, and JAVA_LIBDIR
 set_classpath() {
+  _set_java_home
+
   # get local classpath first
   jars=$@
   if [ -n "$ADDITIONAL_JARS" ] ; then
@@ -130,6 +147,8 @@ run() {
 # Set JVM-related directories
 # Requires a correct $JAVA_LIBDIR, $JAVA_HOME and $JAVA_CMD
 set_jvm_dirs() {
+    _set_java_home
+
     # Jar repository provided by the JVM
     JVM_LIBDIR=$JVM_ROOT-exports/$(echo "$JAVA_HOME" |\
         sed -n "s+$JVM_ROOT/\([-_[:alnum:].]*\)\(.*\)+\1+p")
--- jpackage-utils-1.7.5/misc/macros.jpackage	2008-01-04 13:21:42.000000000 +0200
+++ jpackage-utils-1.7.5/misc/macros.jpackage	2009-05-04 20:00:58.000000000 +0300
@@ -301,6 +301,7 @@ EOF\
 # %3	options
 # %4	jars (separated by ':')
 # %5    the name of script you wish to create
+# %6    whether to prefer a jre over a sdk when finding a jvm
 #
 %jpackage_script() \
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
@@ -311,6 +312,7 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EO
 # JPackage Project <http://www.jpackage.org/>\
 \
 # Source functions library\
+_prefer_jre="%{?6}"\
 . %{_javadir}-utils/java-functions\
 \
 # Source system prefs\


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- jpackage-utils.spec	21 Sep 2009 21:47:39 -0000	1.50
+++ jpackage-utils.spec	30 Apr 2010 21:00:18 -0000	1.51
@@ -34,7 +34,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        3.8%{?dist}
+Release:        3.9%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -43,6 +43,7 @@ Source0:        %{name}-%{version}.tar.b
 Source1:        %{name}-README
 Patch0:         %{name}-enable-gcj-support.patch
 Patch1:         %{name}-own-mavendirs.patch
+Patch2:         %{name}-prefer-jre.patch
 Group:          Utilities
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -62,6 +63,7 @@ information.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 cp %{SOURCE1} .
 
@@ -203,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 30 2010 Deepak Bhole <dbhole at redhat.com> - 0:1.7.5-3.9
+- Stopgap fix for rhbz#461683 from Ville Skyttä.
+
 * Mon Sep 21 2009 Orion Poplawski <orion at cora.nwra.com> - 0:1.7.5-3.8
 - Add Requires: coreutils because we provide scripts that are being executed
   in rpm %%post scriptlets that require it.