rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.46, 1.47 java-1.6.0-openjdk-jhat.patch, 1.1, NONE

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2892/devel

Modified Files:
	java-1.6.0-openjdk.spec 
Removed Files:
	java-1.6.0-openjdk-jhat.patch 
Log Message:
* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Remove jhat patch.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- java-1.6.0-openjdk.spec	30 May 2008 22:43:39 -0000	1.46
+++ java-1.6.0-openjdk.spec	31 May 2008 00:06:17 -0000	1.47
@@ -139,10 +139,7 @@
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
-# FIXME: The licenses in the jhat sources need to be fixed with proper
-# GPL headers.
-Patch1:   java-1.6.0-openjdk-jhat.patch
-Patch2:	  java-1.6.0-openjdk-java-access-bridge-tck.patch
+Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -346,19 +343,15 @@
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
-pushd openjdk-ecj
-  patch -l -p1 < %{PATCH1}
-popd
 %endif
 make stamps/patch.stamp
-patch -l -p0 < %{PATCH1}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
 
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
-  patch -l -p1 < %{PATCH2}
+  patch -l -p1 < %{PATCH1}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -648,6 +641,7 @@
   --slave %{_bindir}/javap javap %{sdkbindir}/javap \
   --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
   --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
+  --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
   --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
   --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
   --slave %{_bindir}/jps jps %{sdkbindir}/jps \
@@ -685,6 +679,8 @@
   %{_mandir}/man1/jconsole-%{name}.1$ext \
   --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
   %{_mandir}/man1/jdb-%{name}.1$ext \
+  --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
+  %{_mandir}/man1/jhat-%{name}.1$ext \
   --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
   %{_mandir}/man1/jinfo-%{name}.1$ext \
   --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \
@@ -880,6 +876,9 @@
 
 %changelog
 * Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Remove jhat patch.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
 - Remove makefile patch.
 - Update generate-fedora-zip.sh.
 


--- java-1.6.0-openjdk-jhat.patch DELETED ---