rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea-jhat.patch, 1.2, 1.3 java-1.7.0-icedtea.spec, 1.16, 1.17 sources, 1.13, 1.14

Lillian Angel (langel) fedora-extras-commits at redhat.com
Fri Oct 12 03:23:49 UTC 2007


Author: langel

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

Modified Files:
	java-1.7.0-icedtea.spec sources 
Added Files:
	java-1.7.0-icedtea-jhat.patch 
Log Message:
* Fri Oct 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.17.b21.snapshot
- Added jhat patch back in.



java-1.7.0-icedtea-jhat.patch:

Index: java-1.7.0-icedtea-jhat.patch
===================================================================
RCS file: java-1.7.0-icedtea-jhat.patch
diff -N java-1.7.0-icedtea-jhat.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java-1.7.0-icedtea-jhat.patch	12 Oct 2007 03:23:46 -0000	1.3
@@ -0,0 +1,39 @@
+--- ../icedtea/openjdk-ecj/j2se/make/sun/Makefile	2007-08-24 12:47:38.000000000 -0400
++++ openjdk/j2se/make/sun/Makefile	2007-08-27 14:42:08.000000000 -0400
+@@ -40,7 +40,7 @@
+ ifndef J2RE_ONLY
+   TOOLS_SUBDIRS  = javap native2ascii serialver jps jstat jstatd
+   TOOLS_SUBDIRS += $(JSADEBUGD_SUBDIR)
+-  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript jhat
++  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript
+ endif
+ 
+ # Rhino/Mozilla java sources
+--- ../icedtea/openjdk/j2se/make/common/Release.gmk	2007-08-16 03:17:47.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-08-27 14:51:39.000000000 -0400
+@@ -169,7 +169,6 @@
+ 	javap.1 \
+ 	jconsole.1 \
+ 	jdb.1 \
+-	jhat.1 \
+   jinfo.1 \
+   jmap.1 \
+   jps.1 \
+@@ -352,7 +351,6 @@
+ 	com/sun/tools/example/debug/expr \
+ 	com/sun/tools/example/debug/tty  \
+ 	com/sun/tools/extcheck  \
+-	com/sun/tools/hat       \
+ 	com/sun/tools/javac     \
+ 	com/sun/tools/javadoc   \
+ 	com/sun/tools/apt       \
+@@ -462,8 +460,7 @@
+ 	wsgen$(EXE_SUFFIX) \
+ 	wsimport$(EXE_SUFFIX) \
+         schemagen$(EXE_SUFFIX) \
+-	jsadebugd$(EXE_SUFFIX) \
+-	jhat$(EXE_SUFFIX)
++	jsadebugd$(EXE_SUFFIX)
+ 
+ # The following get removed from the JRE after the bulk-copy of LIBDIR...
+ NOTJRELIBS = tools.jar \


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- java-1.7.0-icedtea.spec	11 Oct 2007 22:13:46 -0000	1.16
+++ java-1.7.0-icedtea.spec	12 Oct 2007 03:23:46 -0000	1.17
@@ -104,6 +104,7 @@
 Source7:  mauve_tests
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-win32.patch
+Patch2:   java-1.7.0-icedtea-jhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -262,6 +263,7 @@
 ./configure --with-openjdk-src-zip=%{SOURCE1}
 make stamps/patch.stamp
 patch -p0 < %{PATCH1}
+patch -p0 < %{PATCH2}
 make
 pushd java-access-bridge-%{accessver}
   export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -711,6 +713,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Fri Oct 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.17.b21.snapshot
+- Added jhat patch back in.
+
 * Thu Oct 11 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.17.b21.snapshot
 - Update icedtearelease.
 - Update icedteasnapshot.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Oct 2007 22:46:33 -0000	1.13
+++ sources	12 Oct 2007 03:23:46 -0000	1.14
@@ -1,5 +1,5 @@
 ce13ee63357a699ad327d362230cc2f5  java-access-bridge-1.19.2.tar.gz
 220ea131fb26aae7b8ae7ea68a2d2f7c  mauve_tests
-44914ef1c497502ad374686f3e01e9d7  openjdk-7-ea-src-b21-27_sep_2007-fedora.zip
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
-44875981ab2cd6ac746ef6f2d76c1c89  icedtea-1.4.tar.gz
+76716300239d9c20ae072d3e6056c002  openjdk-7-ea-src-b21-27_sep_2007-fedora.zip
+e0f01c35f26c677d5863f84ca48feb53  icedtea-1.4.tar.gz




More information about the fedora-extras-commits mailing list