[java-1.7.0-openjdk: 8/8] Merge branch 'f17'

[Deepak Bhole]

commit f6a27926fb49867d14fa512033640ccc166a7950
Merge: ffd9b27 4583496
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Mon Mar 12 16:26:11 2012 -0400

    Merge branch 'f17'
    
    Conflicts:
    	java-1.7.0-openjdk.spec

 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-rh740762-setlibdir.patch |   33 ++++
 java-1.7.0-openjdk-size_t.patch             |  239 +++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec                     |   78 ++++++++-
 6 files changed, 655 insertions(+), 6 deletions(-)
---
diff --cc java-1.7.0-openjdk.spec
index 3250e02,3e05009..8ee34b2
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@@ -1331,8 -1391,14 +1391,14 @@@ exit 
  %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
  
  %changelog
+ * 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) 
 +- 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