[java-1.7.0-openjdk/f16: 28/28] Merge branch 'f17' into f16

[Deepak Bhole]

commit 77c842095d5216e65199922498224db3e36c66b5
Merge: 01c6c46 aa554b1
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Mon Mar 26 16:45:47 2012 -0400

    Merge branch 'f17' into f16

 java-1.7.0-openjdk-arm-fixes.patch          |   44 +++++
 java-1.7.0-openjdk-arm-ftbfs.patch          |  220 ++++++++++++++++++++++++
 java-1.7.0-openjdk-bitmap.patch             |   47 ++++++
 java-1.7.0-openjdk-ppc-zero-hotspot.patch   |   17 ++
 java-1.7.0-openjdk-ppc-zero-jdk.patch       |   29 ++++
 java-1.7.0-openjdk-remove-mimpure-opt.patch |  150 +++++++++++++++++
 java-1.7.0-openjdk-size_t.patch             |  239 +++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec                     |   92 ++++++++++-
 sources                                     |    2 +-
 9 files changed, 832 insertions(+), 8 deletions(-)
---
diff --cc java-1.7.0-openjdk.spec
index 8e87403,4880dc2..b619c67
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@@ -151,7 -164,7 +164,7 @@@
  
  Name:    java-%{javaver}-%{origin}
  Version: %{javaver}.%{buildver}
- Release: %{icedtea_version}%{?dist}.3
 -Release: %{icedtea_version}%{?dist}.5
++Release: %{icedtea_version}%{?dist}.4
  # 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
@@@ -666,8 -695,24 +698,26 @@@ patch -l -p0 < %{PATCH5
  patch -l -p0 < %{PATCH6}
  %endif
  
 +patch -l -p0 < %{PATCH7}
 +
+ # Type fixes
+ patch -l -p0 < %{PATCH101}
+ patch -l -p0 < %{PATCH102}
+ 
+ # Arm fixes
+ patch -l -p0 < %{PATCH103}
+ patch -l -p0 < %{PATCH104}
+ 
+ %ifarch ppc ppc64
+ # PPC fixes
+ patch -l -p0 < %{PATCH105}
+ patch -l -p0 < %{PATCH106}
+ %endif
+ 
+ # Misc. fixes
+ patch -l -p0 < %{PATCH107}
+ patch -l -p0 < %{PATCH108}
+ 
  # Add a "-icedtea" tag to the version
  sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)-icedtea#" openjdk/jdk/make/common/shared/Defs.gmk
  
@@@ -1327,14 -1397,25 +1402,17 @@@ exit 
  %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
  
  %changelog
 -* Mon Mar 26 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.5
 -- Added SystemTap fixes by Mark Wielaard
++* Mon Mar 26 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.4
++- Merged with F17 branch
+ 
 -* Sat Mar 24 2012 Dan Horák <dan[at]danny.cz>> - 1.7.0.3-2.1.fc17.4
 -- update paths in the ppc patches, add missing snippet
 +* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc16.3
 +- Reverted fix for rh740762
  
 -* Wed Mar 21 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.3
 -- Reverted fix for rhbz#740762
 -- Fixed PPC/PPC64 build (rh804136) -- added patches from Chris Phillips
 -- Moved OpenJDK specific patches to 1XX series
 +* 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
  
 -* Mon Mar 12 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.2
 -- Resolved rhbz#740762: java.library.path is missing some paths
 -- Unified spec file for x86, x86_64, ARM and s390
 -  - Integrated changes from Dan Horák <dhorak at redhat.com> for Zero/s390
 -  - Integrated changes from Chris Phillips <chphilli at redhat.com> for Zero/ARM
 -
 -* Fri Feb 24 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1.fc17.1
 -- Added flag so that debuginfo is built into classfiles (rhbz# 796400)
 +* 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)
  
  * Tue Feb 14 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.3-2.1