[java-1.7.0-openjdk/f16] Resolved rh740762: java.library.path is missing some paths

[Deepak Bhole]

commit 6369e44aadbdc4d3e065ce83f3e285499baeec2c
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Mon Mar 12 17:42:56 2012 -0400

    Resolved rh740762: java.library.path is missing some paths

 java-1.7.0-openjdk-rh740762-setlibdir.patch |   33 +++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec                     |   10 +++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/java-1.7.0-openjdk-rh740762-setlibdir.patch b/java-1.7.0-openjdk-rh740762-setlibdir.patch
new file mode 100644
index 0000000..424643d
--- /dev/null
+++ b/java-1.7.0-openjdk-rh740762-setlibdir.patch
@@ -0,0 +1,33 @@
+diff -up ./openjdk/hotspot/make/linux/makefiles/vm.make.sav ./openjdk/hotspot/make/linux/makefiles/vm.make
+--- ./openjdk/hotspot/make/linux/makefiles/vm.make.sav	2012-03-12 14:50:26.501783501 -0400
++++ ./openjdk/hotspot/make/linux/makefiles/vm.make	2012-03-12 15:02:27.884518939 -0400
+@@ -87,6 +87,7 @@ HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(L
+ BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
+ BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
+ VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
++REG_DIR       = -DREG_DIR="\"$(JNI_LOC)\""
+ 
+ CPPFLAGS =           \
+   ${SYSDEFS}         \
+@@ -96,6 +97,7 @@ CPPFLAGS =           \
+   ${BUILD_USER}      \
+   ${HS_LIB_ARCH}     \
+   ${JRE_VERSION}     \
++  ${REG_DIR}         \
+   ${VM_DISTRO}
+ 
+ ifdef DERIVATIVE_ID
+diff -up ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp.sav ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp.sav	2012-03-12 14:44:14.966559167 -0400
++++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2012-03-12 14:44:33.485271287 -0400
+@@ -393,7 +393,10 @@ void os::init_system_properties_values()
+ 
+ #define EXTENSIONS_DIR  "/lib/ext"
+ #define ENDORSED_DIR    "/lib/endorsed"
++
++#ifndef REG_DIR
+ #define REG_DIR         "/usr/java/packages"
++#endif
+ 
+   {
+     /* sysclasspath, java_home, dll_dir */
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index dbac9da..e566dce 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -151,7 +151,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}.1
+Release: %{icedtea_version}%{?dist}.2
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -243,6 +243,9 @@ Patch6:   %{name}-debuginfo.patch
 # Fix bug in jdk_generic_profile.sh
 Patch7:   %{name}-system-zlib.patch
 
+# Fix RH740762 -- fix jni libdir search paths
+Patch8:   %{name}-rh740762-setlibdir.patch
+
 #
 # OpenJDK specific patches
 #
@@ -667,6 +670,7 @@ patch -l -p0 < %{PATCH6}
 %endif
 
 patch -l -p0 < %{PATCH7}
+patch -l -p0 < %{PATCH8}
 
 # Add a "-icedtea" tag to the version
 sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#" openjdk/jdk/make/common/shared/Defs.gmk
@@ -809,6 +813,7 @@ make \
   FT2_LIBS="-lfreetype " \
   DEBUG_CLASSFILES="true" \
   DEBUG_BINARIES="true" \
+  JNI_LOC="%{_jvmdir}/%{sdkdir}" \
   %{debugbuild}
 
 popd >& /dev/null
@@ -1327,6 +1332,9 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Mon Mar 12 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.2
+- Resolved rh740762: java.library.path is missing some paths
+
 * Fri Feb 24 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.1
 - Added flag so that debuginfo is built into classfiles (rhbz# 796400) 
 - Updated rhino.patch to build scripting support (rhbz# 796398)