rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-netbeans.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.136, 1.137

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11635

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netbeans.patch 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-31.b16
- Added java-1.6.0-openjdk-netbeans.patch.
- Reenabled visualvm.



java-1.6.0-openjdk-netbeans.patch:
 Makefile.am |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE java-1.6.0-openjdk-netbeans.patch ---
--- aMakefile.am	Wed Sep 09 16:44:12 2009 +0100
+++ Makefile.am	Thu Sep 10 16:31:56 2009 -0400
@@ -28,6 +28,14 @@ LIVECONNECT_DIR =
 LIVECONNECT_DIR =
 NPPLUGIN_DIR =
 endif
+endif
+
+if WITH_VISUALVM
+NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
+NB_APISUPPORT=$(shell ls /usr/share/netbeans | grep apisupport | tail -n1)
+else
+NB_PLATFORM=
+NB_APISUPPORT=
 endif
 
 if ENABLE_PULSE_JAVA
@@ -1190,7 +1198,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm	
@@ -1275,7 +1283,7 @@ if WITH_VISUALVM
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
 	cp -r visualvm/build/cluster/* \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
+	cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
 	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
@@ -2033,8 +2041,8 @@ if WITH_VISUALVM
 	cd netbeans ; \
         rm nbbuild/external/binaries-list ; \
 	mkdir -p ./nbbuild/netbeans_visualvm/ ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ ./nbbuild/netbeans_visualvm/$(NB_PLATFORM) ; \
+	ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_APISUPPORT)/ ./nbbuild/netbeans_visualvm/$(NB_APISUPPORT) ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
 	if ! (uname -a | grep x86_64) ; then \
 	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \


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.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- java-1.6.0-openjdk.spec	10 Sep 2009 16:50:34 -0000	1.136
+++ java-1.6.0-openjdk.spec	10 Sep 2009 20:36:59 -0000	1.137
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 30.%{openjdkver}%{?dist}
+Release: 31.%{openjdkver}%{?dist}
 # 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 @@ Patch4:   java-1.6.0-openjdk-accessible-
 Patch5:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
 Patch7:   java-1.6.0-openjdk-x11.patch
+Patch8:	  java-1.6.0-openjdk-netbeans.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -389,6 +390,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
+%patch8
 %patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
@@ -407,7 +409,7 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --with-hotspot-src-zip=%{SOURCE7} \
+  --enable-visualvm -with-hotspot-src-zip=%{SOURCE7} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -574,8 +576,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-#desktop-file-install --vendor ''\
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
+desktop-file-install --vendor ''\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -721,7 +723,7 @@ alternatives \
   --slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
-#  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
+  --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
@@ -936,7 +938,7 @@ exit 0
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
-#%{_datadir}/applications/visualvm.desktop
+%{_datadir}/applications/visualvm.desktop
 %ifarch %{jit_arches}
 %{tapsetdir}/*.stp
 %endif
@@ -964,6 +966,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-31.b16
+- Added java-1.6.0-openjdk-netbeans.patch.
+- Reenabled visualvm.
+
 * Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
 - Temporarily removed building of visualvm.