[visualvm] updated to visualvm 1.3.1

[jiri vanek]

commit ab4a3031d9154e6f7767e87ad2e0332f6aac937c
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Thu Jan 6 14:38:17 2011 +0100

    updated to visualvm 1.3.1

 .gitignore    |    3 +++
 sources       |    7 +++----
 visualvm.spec |   32 ++++++++++++++------------------
 3 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60fd89e..8aab1d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 /netbeans-profiler-visualvm_release69.tar.gz
 /visualvm_13-src.tar.gz
 /visualvm_harness-1.0.tar.gz
+/netbeans-profiler-visualvm_release691.tar.gz
+/visualvm_131-src.tar.gz
+/visualvm_harness-1.1.tar.gz
diff --git a/sources b/sources
index 5d297a0..6b58e42 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-44f6465fc9a7ae73f7f2c21291cdd22a  build.jar.tar.gz
-aeca7cbd0f1dfb30858d80fa1e150820  netbeans-profiler-visualvm_release69.tar.gz
-f1a28e24451982114be6590ceddeae12  visualvm_13-src.tar.gz
-3dac8c562bc847d2782bdc192826271f  visualvm_harness-1.0.tar.gz
+e910520f2e986ae6bd161e8cc385ab86  netbeans-profiler-visualvm_release691.tar.gz
+4b8468d7ba809d57597cc6983a33842c  visualvm_131-src.tar.gz
+529912fdc16fd420632045a37ae19d85  visualvm_harness-1.1.tar.gz
diff --git a/visualvm.spec b/visualvm.spec
index 741adf9..1052dbf 100644
--- a/visualvm.spec
+++ b/visualvm.spec
@@ -1,19 +1,18 @@
-%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/152022/
-%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/151835/
-%global visualvmharnessver 1.0 
+%global nbprofilerurl https://visualvm.dev.java.net/files/documents/7163/153051/
+%global visualvmurl https://visualvm.dev.java.net/files/documents/7163/153046/
+%global visualvmharnessver 1.1 
 
 Name:       visualvm    
-Version:    1.3
-Release:    10%{?dist}
+Version:    1.3.1
+Release:    1%{?dist}
 Summary:    Lightweight profiler that integrates many command-line JDK tools
 
 Group:      Development/Tools  
 License:    GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL)
 URL:        http://visualvm.dev.java.net/
 Source0:    http://icedtea.classpath.org/download/source/visualvm_harness-%{visualvmharnessver}.tar.gz
-Source1:    %{visualvmurl}/visualvm_13-src.tar.gz
-Source2:    %{nbprofilerurl}/netbeans-profiler-visualvm_release69.tar.gz
-Source3:    build.jar.tar.gz
+Source1:    %{visualvmurl}/visualvm_131-src.tar.gz
+Source2:    %{nbprofilerurl}/netbeans-profiler-visualvm_release691.tar.gz
 
 Patch0:   visualvm-debuginfo.patch
 Patch1:   jvisualvm-luncher.patch
@@ -25,11 +24,11 @@ BuildRequires:    java >= 1.6.0
 BuildRequires:    java-devel >= 1.6.0 
 BuildRequires:    jakarta-commons-logging
 BuildRequires:    desktop-file-utils
-BuildRequires:    netbeans-platform >= 6.9
+BuildRequires:    netbeans-platform >= 6.9-1
 BuildRequires:    netbeans-platform-harness
 BuildRequires:    netbeans-apisupport
 
-Requires:         netbeans-platform >= 6.9
+Requires:         netbeans-platform >= 6.9-1
 Requires:         java >= 1.6.0 
 
 Conflicts:        java-1.6.0-openjdk <= 1:1.6.0.0-43
@@ -44,26 +43,19 @@ performance analysis for the Java SE platform.
 
 %prep
 %setup -q -n visualvm_harness-%{visualvmharnessver}
-#untar sources of bundled jar, because all other sources are unntared by make
-tar -zxvf %{SOURCE3} -C .
 
 %build
 ./configure --libdir=%{_libdir} \
             --prefix=%{_libdir}/%{name} \
             --with-visualvm-zip=%{SOURCE1} \
             --with-netbeans-profiler-zip=%{SOURCE2} \
-            --with-visualvm-version=1.3 
+            --with-visualvm-version=1.3.1
 #            --sysconfdir=/etc - is ignored!
 
 #applying patch - not standard. But patch is applied to script called by make. Thats why it's here.
 make extract-netbeans-profiler
 patch -p0 < %{PATCH0}
 
-#build bundled jar
-rm netbeans/nbbuild/sierra/build.jar
-javac build.jar/build/build.java
-jar cvf netbeans/nbbuild/sierra/build.jar build.jar/*
-
 make
 
 patch -p0 < %{PATCH1}
@@ -131,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 24 2010 Jiri Vanek  <jvanek at redhat.com> - 1.3.1-1
+- updated to harens 1.1, profiler 6.9.1  and visualvm 1.3.1
+- removed build of bundled jar - already fixed upstream
+
 * Wed Nov 24 2010 Jiri Vanek  <jvanek at redhat.com> - 1.3-10
 - resolves 667314