[java-1.7.0-openjdk/f17] Updated to icedtea-forest 2.3

jiri vanek jvanek at fedoraproject.org
Mon Aug 20 10:13:50 UTC 2012


commit d1c24868f0db9cfc12db3024cc4bc7889fb56adb
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Mon Aug 20 12:18:03 2012 +0200

    Updated to icedtea-forest 2.3

 java-1.7.0-openjdk-removing_jvisualvm_man.patch |   10 ++++++++++
 java-1.7.0-openjdk.spec                         |   17 ++++++++++++++---
 sources                                         |    5 ++---
 3 files changed, 26 insertions(+), 6 deletions(-)
---
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 664055b..1135cb5 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}.9
+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}
@@ -405,6 +406,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 +693,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 || :`
@@ -1427,6 +1432,12 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Mon Aug 20 2012 jiri Vanek <jvanek at redhat.com> - 1.7.0.6-2.3.fc16.1
+- Updated to latest IcedTea7-forest-2.3
+- Current build is u6
+- Added Patch500, java-1.7.0-openjdk-removing_jvisualvm_man.patch to remove 
+  jvisualvm manpages from processing
+
 * Mon Jul 09 2012 Deepak Bhole <dbhole at redhat.com> - 1.7.0.5-2.2.1.fc18.9
 - Added support to build older (2.1.1/u3/hs22) version on non-jit (secondary)
   arches
diff --git a/sources b/sources
index 68882ae..04e3486 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,6 @@ ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 868ff2d4457d1a2dccfa465fb8220e1c  generated-files.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
-de9dacf33022e55f73adee31680d8fdb  openjdk-icedtea-2.2.1.tar.gz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
-241579dc0bfb5c148d2f826284817ea9  openjdk-icedtea-2.1.1.tar.gz
+363f3266940780966014ebc6bb7f1253  openjdk-icedtea-2.3.tar.gz
+8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz


More information about the scm-commits mailing list