rpms/java-1.6.0-openjdk/devel .cvsignore, 1.40, 1.41 java-1.6.0-openjdk-makefile.patch, 1.9, 1.10 java-1.6.0-openjdk.spec, 1.74, 1.75 sources, 1.40, 1.41

Thu Oct 2 21:15:19 UTC 2008

Author: langel

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

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk.spec sources 
Log Message:

ct  2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.22.b12
- Enabled building of jvisualvm tool.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41

--- .cvsignore	24 Sep 2008 18:19:38 -0000	1.40
+++ .cvsignore	2 Oct 2008 21:14:48 -0000	1.41
@@ -2,4 +2,7 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
 openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
-icedtea6-1.3-098f7819fe90d0cc65e701763ed375b2099885b9.tar.gz
+icedtea6-1.3-09dcedbe63a8a68289c0cc53e603fceef43a7d26.tar.gz
+visualvm-20080728-src.tar.gz
+netbeans-profiler-visualvm_preview2.tar.gz
+netbeans-6.1-200805300101-basic_cluster-src.zip

java-1.6.0-openjdk-makefile.patch:

Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-1.6.0-openjdk-makefile.patch	8 Sep 2008 13:07:18 -0000	1.9
+++ java-1.6.0-openjdk-makefile.patch	2 Oct 2008 21:14:48 -0000	1.10
@@ -1,6 +1,52 @@
---- makeam	2008-08-05 10:44:07.000000000 -0400
-+++ Makefile.am	2008-08-05 10:44:39.000000000 -0400
-@@ -515,7 +515,6 @@
+diff -r 09dcedbe63a8 Makefile.am
+--- oldMakefile.am	Thu Oct 02 10:55:55 2008 -0400
++++ Makefile.am	Thu Oct 02 15:12:05 2008 -0400
+@@ -330,44 +330,6 @@
+ endif
+ endif
+ endif
+-if WITH_VISUALVM
+-	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
+-	  | $(MD5SUM) --check ; \
+-	then \
+-	  if [ $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ] ; \
+-	  then \
+-	    mv $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP).old ; \
+-	  fi ; \
+-	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
+-	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
+-	fi
+-
+-if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
+-else
+-	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+-	  | $(MD5SUM) --check ; \
+-	then \
+-	  if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
+-	  then \
+-	    mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
+-	  fi ; \
+-	  $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
+-	    -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
+-	fi
+-endif
+-if USE_ALT_VISUALVM_SRC_ZIP
+-else
+-	if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
+-	  | $(MD5SUM) --check ; \
+-	then \
+-	  if [ $(VISUALVM_SRC_ZIP) ] ; \
+-	  then \
+-	    mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
+-	  fi ; \
+-	  $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) -O $(VISUALVM_SRC_ZIP) ; \
+-	fi
+-endif
+-endif
+ 	mkdir -p stamps
+ 	touch stamps/download.stamp
+ 
+@@ -527,7 +489,6 @@
  	  mkdir openjdk ; \
  	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
  	  chmod -R ug+w openjdk ; \
@@ -8,7 +54,7 @@
  	fi
  if WITH_CACAO
  if !USE_SYSTEM_CACAO
-@@ -549,7 +548,7 @@
+@@ -570,7 +531,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  


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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- java-1.6.0-openjdk.spec	24 Sep 2008 19:00:13 -0000	1.74
+++ java-1.6.0-openjdk.spec	2 Oct 2008 21:14:48 -0000	1.75
@@ -7,7 +7,7 @@
 %define runtests 0
 
 %define icedteaver 1.3
-%define icedteasnapshot -098f7819fe90d0cc65e701763ed375b2099885b9
+%define icedteasnapshot -09dcedbe63a8a68289c0cc53e603fceef43a7d26
 %define openjdkver b12
 %define openjdkdate 28_aug_2008
 
@@ -18,6 +18,9 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
+%define visualvmurl http://icedtea.classpath.org/visualvm/
+%define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/
+
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
@@ -105,7 +108,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.21.%{openjdkver}%{?dist}
+Release: 0.22.%{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
@@ -129,6 +132,9 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
+Source9:  %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
+Source10: %{visualvmurl}/visualvm-20080728-src.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -189,6 +195,13 @@
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
+# visualvm build requirements.
+BuildRequires: netbeans
+BuildRequires: netbeans-platform8
+BuildRequires: netbeans-platform8-harness
+BuildRequires: netbeans-apisupport1
+BuildRequires: netbeans-java2
+BuildRequires: netbeans-ide9
 
 Requires: rhino
 Requires: libjpeg = 6b
@@ -340,13 +353,16 @@
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
+cp %{SOURCE8} .
+cp %{SOURCE9} .
+cp %{SOURCE10} .
 
 %build
 # Build IcedTea and OpenJDK.
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
@@ -497,6 +513,8 @@
 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
 for e in jconsole policytool ; do
     desktop-file-install --vendor=fedora --mode=644 \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -645,6 +663,7 @@
   --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}/native2ascii native2ascii %{sdkbindir}/native2ascii \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
   --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \
@@ -798,6 +817,7 @@
 %{_mandir}/man1/unpack200-%{name}.1*
 %{_datadir}/pixmaps/javaws.png
 %{_datadir}/applications/javaws.desktop
+%{_datadir}/applications/visualvm.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -869,7 +889,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.19.b09
+* Thu Oct  2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.22.b12
+- Enabled building of jvisualvm tool.
+
+* Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12
 - Removed all instances of security jars.
 
 * Wed Sep 24 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.21.b12


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	24 Sep 2008 18:19:38 -0000	1.40
+++ sources	2 Oct 2008 21:14:48 -0000	1.41
@@ -2,4 +2,7 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 482c858d25959c0cb77c1fa59161ce2a  openjdk-6-src-b12-28_aug_2008-fedora.tar.gz
-8ba50de8bb257a7fd96bcd4500fa4c6b  icedtea6-1.3-098f7819fe90d0cc65e701763ed375b2099885b9.tar.gz
+d4c79fecf31e2107e94133efe1e271fd  icedtea6-1.3-09dcedbe63a8a68289c0cc53e603fceef43a7d26.tar.gz
+4b55bc623418818793392bb233da2927  visualvm-20080728-src.tar.gz
+ff8e8abc42df6c6749e6b02bcf7bb0a5  netbeans-profiler-visualvm_preview2.tar.gz
+a7ea855f475fa3a982f094a45c155ab4  netbeans-6.1-200805300101-basic_cluster-src.zip


