rpms/java-1.6.0-openjdk/devel .cvsignore, 1.53, 1.54 java-1.6.0-openjdk.spec, 1.105, 1.106 sources, 1.59, 1.60

[Lillian Angel]

Author: langel

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

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Wed Feb 25 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-12.b14
- Updated release.
- Updated icedteaver.
- Re-enabled visualvm building.
- Installed jvisualvm appropriately.
- Resolves: rhbz#480487
- Resolves: rhbz#482943




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	22 Jan 2009 16:26:00 -0000	1.53
+++ .cvsignore	25 Feb 2009 18:46:14 -0000	1.54
@@ -3,4 +3,6 @@
 mauve-2008-10-22.tar.gz
 openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 hotspot.tar.gz
-icedtea6-1.4.tar.gz
+icedtea6-1.4.1.tar.gz
+netbeans-profiler-visualvm_release65_mod.tar.gz
+visualvm-11-src.tar.gz


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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- java-1.6.0-openjdk.spec	25 Feb 2009 08:59:47 -0000	1.105
+++ java-1.6.0-openjdk.spec	25 Feb 2009 18:46:14 -0000	1.106
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.4
+%define icedteaver 1.4.1
 %define icedteasnapshot %{nil}
 %define openjdkver b14
 %define openjdkdate 25_nov_2008
@@ -18,6 +18,9 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
+
+%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127067/
+%define netbeansurl http://icedtea.classpath.org/visualvm/
 %define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
@@ -131,6 +134,8 @@
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
 Source7: %{hotspoturl}/hotspot.tar.gz
+Source8: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
+Source9: %{visualvmurl}/visualvm-11-src.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -198,6 +203,9 @@
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
+# visualvm build requirements.
+BuildRequires: netbeans
+BuildRequires: jakarta-commons-logging
 
 Requires: rhino
 Requires: libjpeg = 6b
@@ -350,6 +358,8 @@
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
+cp %{SOURCE8} .
+cp %{SOURCE9} .
 
 %build
 # Build IcedTea and OpenJDK.
@@ -362,7 +372,7 @@
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --with-hotspot-src-zip=hotspot.tar.gz
+  --with-hotspot-src-zip=hotspot.tar.gz --enable-visualvm
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
@@ -516,6 +526,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
@@ -664,6 +676,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 \
@@ -869,6 +882,7 @@
 %{_mandir}/man1/wsgen-%{name}.1*
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
+%{_datadir}/applications/visualvm.desktop
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
@@ -893,6 +907,14 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Wed Feb 25 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-12.b14
+- Updated release.
+- Updated icedteaver.
+- Re-enabled visualvm building.
+- Installed jvisualvm appropriately.
+- Resolves: rhbz#480487
+- Resolves: rhbz#482943  
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.0.0-11.b14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	28 Jan 2009 15:56:15 -0000	1.59
+++ sources	25 Feb 2009 18:46:14 -0000	1.60
@@ -3,4 +3,6 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 bd07d61915e403a55a6ef42842b0cf8c  openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
 c8f78d48ac83987bc2adebeebcd354e9  hotspot.tar.gz
-6428ca1b0c38111cca230f5b69460b03  icedtea6-1.4.tar.gz
+d23d1aef39f1f351ed0ddec0bbbf9356  icedtea6-1.4.1.tar.gz
+786ab31817cbd902a7211cd6a6161750  netbeans-profiler-visualvm_release65_mod.tar.gz
+1174486e82a65840b44c47166d79f212  visualvm-11-src.tar.gz