[java-1.7.0-openjdk/f16] Reverted fix for rh740762

[Deepak Bhole]

commit 01c6c46de12d943c266870015f6e0b45124d1770
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Wed Mar 21 13:37:35 2012 -0400

    Reverted fix for rh740762

 java-1.7.0-openjdk-rh740762-setlibdir.patch |   33 ---------------------------
 java-1.7.0-openjdk.spec                     |   10 +++-----
 2 files changed, 4 insertions(+), 39 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index e566dce..8e87403 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}.2
+Release: %{icedtea_version}%{?dist}.3
 # 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,9 +243,6 @@ 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
 #
@@ -670,7 +667,6 @@ 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
@@ -813,7 +809,6 @@ make \
   FT2_LIBS="-lfreetype " \
   DEBUG_CLASSFILES="true" \
   DEBUG_BINARIES="true" \
-  JNI_LOC="%{_jvmdir}/%{sdkdir}" \
   %{debugbuild}
 
 popd >& /dev/null
@@ -1332,6 +1327,9 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.3
+- Reverted fix for rh740762
+
 * 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