[java-1.7.0-openjdk] Sync with f18

jiri vanek jvanek at fedoraproject.org
Mon Aug 27 09:56:02 UTC 2012 

commit e2d69df2627860e18e6b49bc34dd9d43ad87f96f
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Mon Aug 27 11:55:20 2012 +0200

    Sync with f18

 java-1.7.0-openjdk-arm-fixes.patch              |   22 -------------------
 java-1.7.0-openjdk-freetype-check-fix.patch     |   22 +++++++++++++++++++
 java-1.7.0-openjdk-removing_jvisualvm_man.patch |   10 ++++++++
 java-1.7.0-openjdk.spec                         |   26 +++++++++++++++++++---
 4 files changed, 54 insertions(+), 26 deletions(-)
---
diff --git a/java-1.7.0-openjdk-arm-fixes.patch b/java-1.7.0-openjdk-arm-fixes.patch
index 47f28dc..fc8bf9d 100644
--- a/java-1.7.0-openjdk-arm-fixes.patch
+++ b/java-1.7.0-openjdk-arm-fixes.patch
@@ -1,25 +1,3 @@
-diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
-+++ openjdk/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
-@@ -814,12 +814,12 @@ ifdef OPENJDK
- 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
- 	    $(ECHO) "Failed to build freetypecheck." ) > $@
- 
--    sane-freetype: $(TEMPDIR)/freetypeinfo
--	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
--	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
--	          " or higher is required. \n" \
--		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
--	fi
-+#    sane-freetype: $(TEMPDIR)/freetypeinfo
-+#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
-+#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
-+#	          " or higher is required. \n" \
-+#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
-+#	fi
-   else
-     #do nothing  (cross-compiling)
-     sane-freetype: 
 diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
 --- openjdk/jdk/make/jdk_generic_profile.sh.sav	2012-02-14 16:12:48.000000000 -0500
 +++ openjdk/jdk/make/jdk_generic_profile.sh	2012-03-07 17:31:26.154840740 -0500
diff --git a/java-1.7.0-openjdk-freetype-check-fix.patch b/java-1.7.0-openjdk-freetype-check-fix.patch
new file mode 100644
index 0000000..15c2d67
--- /dev/null
+++ b/java-1.7.0-openjdk-freetype-check-fix.patch
@@ -0,0 +1,22 @@
+diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
+@@ -814,12 +814,12 @@ ifdef OPENJDK
+ 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
+ 	    $(ECHO) "Failed to build freetypecheck." ) > $@
+ 
+-    sane-freetype: $(TEMPDIR)/freetypeinfo
+-	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
+-	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
+-	          " or higher is required. \n" \
+-		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
+-	fi
++#    sane-freetype: $(TEMPDIR)/freetypeinfo
++#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
++#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
++#	          " or higher is required. \n" \
++#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
++#	fi
+   else
+     #do nothing  (cross-compiling)
+     sane-freetype: 
diff --git a/java-1.7.0-openjdk-removing_jvisualvm_man.patch b/java-1.7.0-openjdk-removing_jvisualvm_man.patch
new file mode 100644
index 0000000..a2b739a
--- /dev/null
+++ b/java-1.7.0-openjdk-removing_jvisualvm_man.patch
@@ -0,0 +1,10 @@
+--- openjdk/jdk/make/common/Release.gmk	Wed Aug 15 19:38:26 2012 +0100
++++ openjdk/jdk/make/common/Release.gmk	Wed Aug 15 19:38:26 2012 +0100
+@@ -158,7 +158,6 @@
+         jstack.1           \
+         jstat.1            \
+         jstatd.1           \
+-        jvisualvm.1        \
+ 	native2ascii.1     \
+ 	rmic.1             \
+         schemagen.1        \
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 389b9c2..6ecd635 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -9,7 +9,7 @@
 # If runtests is 0 test suites will not be run.
 %global runtests 0
 
-%global icedtea_version 2.2.1
+%global icedtea_version 2.3
 %global hg_tag icedtea-{icedtea_version}
 
 %global accessmajorver 1.23
@@ -110,7 +110,7 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global buildver        5
+%global buildver        6
 # Keep priority on 5digits in case buildver>9
 %global priority        1700%{buildver}
 %global javaver         1.7.0
@@ -153,7 +153,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}.10
+Release: %{icedtea_version}%{?dist}.1
 # 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
@@ -174,6 +174,7 @@ URL:      http://openjdk.java.net/
 #REPO=http://icedtea.classpath.org/hg/icedtea7-forest
 #current release
 #REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
+#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
 # hg clone $REPO/ openjdk -r %{hg_tag}
 # hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
 # hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag}
@@ -271,6 +272,8 @@ Patch103: %{name}-arm-fixes.patch
 Patch104: %{name}-ppc-zero-jdk.patch
 Patch105: %{name}-ppc-zero-hotspot.patch
 
+Patch106: %{name}-freetype-check-fix.patch
+
 #
 # Bootstrap patches (code with this is never shipped)
 #
@@ -405,6 +408,8 @@ Patch302: systemtap.patch
 # Rhino support
 Patch400: rhino-icedtea-2.1.1.patch
 
+Patch500: java-1.7.0-openjdk-removing_jvisualvm_man.patch
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@@ -690,6 +695,8 @@ cp -a openjdk openjdk-boot
 
 %endif
 
+%patch500
+
 %build
 # How many cpu's do we have?
 export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
@@ -722,6 +729,8 @@ patch -l -p0 < %{PATCH102}
 patch -l -p0 < %{PATCH103}
 %endif
 
+patch -l -p0 < %{PATCH106}
+
 %ifarch ppc ppc64
 # PPC fixes
 patch -l -p0 < %{PATCH104}
@@ -892,7 +901,7 @@ make \
   FT2_LIBS="-lfreetype " \
   DEBUG_CLASSFILES="true" \
   DEBUG_BINARIES="true" \
-  ALT_STRIP_POLICY="no_strip" \
+  STRIP_POLICY="no_strip" \
 %ifnarch %{jit_arches}
   LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \
   LIBFFI_LIBS="-lffi " \
@@ -1427,6 +1436,15 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Mon Aug 27 2012 Jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.fc19.1
+- Updated to latest IcedTea7-forest-2.3
+- Current build is u6
+- ALT_STRIP_POLICY replaced by STRIP_POLICY
+- Patch103 java-1.7.0-opendk-arm-fixes.patch split to itself and new 
+  Patch106 java-1.7.0-opendk-freetype-check-fix.patch by meaning. Both applied.
+- Added Patch500, java-1.7.0-openjdk-removing_jvisualvm_man.patch to remove 
+  jvisualvm manpages from processing
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.0.5-2.2.1.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

More information about the scm-commits mailing list