rpms/java-1.7.0-icedtea/devel generate-fedora-zip.sh, 1.3, 1.4 java-1.7.0-icedtea-jhat.patch, 1.4, 1.5 java-1.7.0-icedtea.spec, 1.18, 1.19 sources, 1.16, 1.17

Lillian Angel (langel) fedora-extras-commits at redhat.com
Mon Oct 15 18:37:00 UTC 2007 

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8360

Modified Files:
	generate-fedora-zip.sh java-1.7.0-icedtea-jhat.patch 
	java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Oct 15 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.19.b21.snapshot
- Updated release.




Index: generate-fedora-zip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/generate-fedora-zip.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- generate-fedora-zip.sh	12 Oct 2007 16:06:28 -0000	1.3
+++ generate-fedora-zip.sh	15 Oct 2007 18:36:26 -0000	1.4
@@ -59,7 +59,7 @@
 # Remove jhat sources.  Most have questionable license headers.
 rm -rf \
   openjdk/j2se/src/share/classes/com/sun/tools/hat \
-  openjdk/j2se/make/sun/jhat/Makefile
+  openjdk/j2se/test/sun/tools/jhat
 
 # Remove J2DBench sources, some of which have questionable license
 # headers.

java-1.7.0-icedtea-jhat.patch:

Index: java-1.7.0-icedtea-jhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-jhat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-1.7.0-icedtea-jhat.patch	12 Oct 2007 13:41:06 -0000	1.4
+++ java-1.7.0-icedtea-jhat.patch	15 Oct 2007 18:36:26 -0000	1.5
@@ -1,13 +1,6 @@
---- openjdk.old/j2se/make/common/Release.gmk	2007-09-27 03:52:06.000000000 -0400
-+++ openjdk/j2se/make/common/Release.gmk	2007-10-12 08:21:55.000000000 -0400
-@@ -165,7 +165,6 @@
- 	javap.1            \
- 	jconsole.1         \
- 	jdb.1              \
--	jhat.1             \
-         jinfo.1            \
-         jmap.1             \
-         jps.1              \
+diff -ruN openjdkb21/openjdk/j2se/make/common/Release.gmk openjdk/j2se/make/common/Release.gmk
+--- openjdkb21/openjdk/j2se/make/common/Release.gmk	2007-09-27 03:52:06.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-15 10:17:19.000000000 -0400
 @@ -373,7 +372,6 @@
  	com/sun/tools/example/debug/expr \
  	com/sun/tools/example/debug/tty  \
@@ -26,8 +19,20 @@
  
  # The following get removed from the JRE after the bulk-copy of LIBDIR...
  NOTJRELIBS = tools.jar \
---- openjdk.old/j2se/make/sun/tools/Makefile	2007-09-27 03:52:13.000000000 -0400
-+++ openjdk/j2se/make/sun/tools/Makefile	2007-10-12 08:30:38.000000000 -0400
+diff -ruN openjdkb21/openjdk/j2se/make/launchers/Makefile openjdk/j2se/make/launchers/Makefile
+--- openjdkb21/openjdk/j2se/make/launchers/Makefile	2007-09-27 03:52:09.000000000 -0400
++++ openjdk/j2se/make/launchers/Makefile	2007-10-15 10:18:32.000000000 -0400
+@@ -70,7 +70,6 @@
+ $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
+   -J-Djconsole.showOutputViewer, )
+ $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
+-$(call make-launcher, jhat, com.sun.tools.hat.Main, , )
+ $(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
+   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
+   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
+diff -ruN openjdkb21/openjdk/j2se/make/sun/tools/Makefile openjdk/j2se/make/sun/tools/Makefile
+--- openjdkb21/openjdk/j2se/make/sun/tools/Makefile	2007-09-27 03:52:13.000000000 -0400
++++ openjdk/j2se/make/sun/tools/Makefile	2007-10-15 10:16:52.000000000 -0400
 @@ -42,7 +42,6 @@
    sun/tools/jstack \
    sun/tools/jstat \
@@ -50,13 +55,39 @@
  # Extra jrunscript files
  JRUNSCRIPT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/script/shell
  FILES_copy = \
---- openjdk.old/j2se/make/launchers/Makefile	2007-09-27 03:52:09.000000000 -0400
-+++ openjdk/j2se/make/launchers/Makefile	2007-10-12 08:31:08.000000000 -0400
-@@ -70,7 +70,6 @@
- $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
-   -J-Djconsole.showOutputViewer, )
- $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
--$(call make-launcher, jhat, com.sun.tools.hat.Main, , )
- $(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
-   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
-   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
+diff -ruN openjdkb21/openjdk/j2se/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh openjdk/j2se/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh
+--- openjdkb21/openjdk/j2se/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2007-09-27 04:20:15.000000000 -0400
++++ openjdk/j2se/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2007-10-15 10:19:33.000000000 -0400
+@@ -49,10 +49,6 @@
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES \
+     DumpHeap ${DUMPFILE} || exit 2
+ 
+-# check that heap dump is parsable
+-${TESTJAVA}/bin/jhat -parseonly true ${DUMPFILE}
+-if [ $? != 0 ]; then failed=1; fi
+-
+ # dump file is large so remove it
+ rm ${DUMPFILE}
+ 
+diff -ruN openjdkb21/openjdk/j2se/test/sun/tools/common/CommonSetup.sh openjdk/j2se/test/sun/tools/common/CommonSetup.sh
+--- openjdkb21/openjdk/j2se/test/sun/tools/common/CommonSetup.sh	2007-09-27 04:20:43.000000000 -0400
++++ openjdk/j2se/test/sun/tools/common/CommonSetup.sh	2007-10-15 10:18:52.000000000 -0400
+@@ -58,7 +58,6 @@
+ JSTACK="${TESTJAVA}/bin/jstack"
+ JMAP="${TESTJAVA}/bin/jmap"
+ JINFO="${TESTJAVA}/bin/jinfo"
+-JHAT="${TESTJAVA}/bin/jhat"
+ 
+ OS=`uname -s`
+ 
+diff -ruN openjdkb21/openjdk/j2se/test/tools/launcher/versionOpt.sh openjdk/j2se/test/tools/launcher/versionOpt.sh
+--- openjdkb21/openjdk/j2se/test/tools/launcher/versionOpt.sh	2007-09-27 04:20:44.000000000 -0400
++++ openjdk/j2se/test/tools/launcher/versionOpt.sh	2007-10-15 10:19:19.000000000 -0400
+@@ -76,7 +76,6 @@
+ javap \
+ jconsole \
+ jdb \
+-jhat \
+ jinfo \
+ jmap \
+ jps \


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- java-1.7.0-icedtea.spec	12 Oct 2007 19:25:08 -0000	1.18
+++ java-1.7.0-icedtea.spec	15 Oct 2007 18:36:26 -0000	1.19
@@ -84,7 +84,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.18.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.19.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -713,6 +713,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Oct 15 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.19.b21.snapshot
+- Updated release.
+
 * Fri Oct 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.18.b21.snapshot
 - Updated release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Oct 2007 16:24:28 -0000	1.16
+++ sources	15 Oct 2007 18:36:26 -0000	1.17
@@ -1,5 +1,5 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 220ea131fb26aae7b8ae7ea68a2d2f7c  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-76716300239d9c20ae072d3e6056c002  openjdk-7-ea-src-b21-27_sep_2007-fedora.zip
 82d0e7d696577c0c480f343b9f85dd08  icedtea-1.4.tar.gz
+b0aba31dfb0ab919e94cf82017a33cf6  openjdk-7-ea-src-b21-27_sep_2007-fedora.zip

More information about the fedora-extras-commits mailing list