[visualvm] updated to harness 1.1pre

[jiri vanek]

commit 4b5812502a9e3e8100b632d45a3e180b92292ce6
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Sun Jan 9 21:19:09 2011 +0100

    updated to harness 1.1pre

 .gitignore               |    1 +
 jvisualvm-luncher.patch  |   22 ----------------
 sources                  |    2 +-
 visualvm-debuginfo.patch |   24 ------------------
 visualvm.spec            |   61 ++++++++-------------------------------------
 5 files changed, 13 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8aab1d5..9910377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /netbeans-profiler-visualvm_release691.tar.gz
 /visualvm_131-src.tar.gz
 /visualvm_harness-1.1.tar.gz
+/visualvm_harness-1.1pre.tar.gz
diff --git a/sources b/sources
index 6b58e42..1ec39f6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 e910520f2e986ae6bd161e8cc385ab86  netbeans-profiler-visualvm_release691.tar.gz
 4b8468d7ba809d57597cc6983a33842c  visualvm_131-src.tar.gz
-529912fdc16fd420632045a37ae19d85  visualvm_harness-1.1.tar.gz
+9ab53ec5e04ae7334f5a22654d754aa9  visualvm_harness-1.1pre.tar.gz
diff --git a/visualvm.spec b/visualvm.spec
index 1052dbf..66accbb 100644
--- a/visualvm.spec
+++ b/visualvm.spec
@@ -1,10 +1,10 @@
 %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 
+%global visualvmharnessver 1.1pre
 
 Name:       visualvm    
 Version:    1.3.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Lightweight profiler that integrates many command-line JDK tools
 
 Group:      Development/Tools  
@@ -14,9 +14,6 @@ Source0:    http://icedtea.classpath.org/download/source/visualvm_harness-%{visu
 Source1:    %{visualvmurl}/visualvm_131-src.tar.gz
 Source2:    %{nbprofilerurl}/netbeans-profiler-visualvm_release691.tar.gz
 
-Patch0:   visualvm-debuginfo.patch
-Patch1:   jvisualvm-luncher.patch
-
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:    wget
@@ -45,36 +42,20 @@ performance analysis for the Java SE platform.
 %setup -q -n visualvm_harness-%{visualvmharnessver}
 
 %build
-./configure --libdir=%{_libdir} \
-            --prefix=%{_libdir}/%{name} \
+./configure --prefix=/usr \
             --with-visualvm-zip=%{SOURCE1} \
             --with-netbeans-profiler-zip=%{SOURCE2} \
-            --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}
+            --with-visualvm-version=1.3.1 \
+            --sysconfdir=/etc \
+            --libdir=%{_libdir} \
+            --datadir=%{_datadir}
 
 make
 
-patch -p0 < %{PATCH1}
-sed -i -e s:"^#jdkhome=.*":jdkhome="/usr/lib/jvm/java":g \
-    visualvm/launcher/visualvm.conf    
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share
-
-desktop-file-install --vendor ''\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
-
-sed 's/Exec.*/Exec=jvisualvm/g'  <  $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop >   $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2
-rm $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop
-mv $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop2 $RPM_BUILD_ROOT%{_datadir}/applications/visualvm.desktop
-
 #silence rpmlint for necessary empty files
 find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/  -type f -empty | while read FILE; do echo "
 " > $FILE;done
@@ -82,30 +63,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/  -type f -empt
 echo "
 " > $RPM_BUILD_ROOT/%{_libdir}/visualvm/profiler/.lastModified
 
-
-# little hell is comming - make istall is generating totaly weird and useless directory structure, so we need to link it from right place to right place an more
-mkdir $RPM_BUILD_ROOT/etc
-mv  $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.conf $RPM_BUILD_ROOT/etc/visualvm.conf
-mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/visualvm.clusters
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/
-mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm
-
-#replace all / in prefix by \/ to be usable in sed
-SEDPREFIX=%{_libdir}/%{name}
-SEDPREFIX2=`echo $SEDPREFIX | sed 's/\//\\\\\//g'`
-echo $SEDPREFIX2
-
-#will write path where the file is installed to launcher. Needed for /etc hack
-sed s/XprefixX/$SEDPREFIX2/g  < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm >  $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm
-#remove source binary
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm
-
-#move launcher from libdir tu /usr/bin
-mkdir $RPM_BUILD_ROOT/%{_bindir}/
-mv $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm   $RPM_BUILD_ROOT/%{_bindir}/
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 24 2010 Jiri Vanek  <jvanek at redhat.com> - 1.3.1-2
+- updated to harens 1.1pre
+- removed file-changes fixed by upstream.
+
 * 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