[visualvm/f14/master] repaired spalsh screen and title, repaired desktop file, repaired dependencies

[jiri vanek]

commit 1b85550b24971347c48622f767fc10808a08856a
Author: Jiri Vanek <jvanek at dhcp-2-137.brq.redhat.com>
Date:   Wed Jan 5 10:47:18 2011 +0100

    repaired spalsh screen and title, repaired desktop file, repaired dependencies

 visualvm.spec |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/visualvm.spec b/visualvm.spec
index 74bab9e..741adf9 100644
--- a/visualvm.spec
+++ b/visualvm.spec
@@ -4,7 +4,7 @@
 
 Name:       visualvm    
 Version:    1.3
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    Lightweight profiler that integrates many command-line JDK tools
 
 Group:      Development/Tools  
@@ -20,14 +20,15 @@ Patch1:   jvisualvm-luncher.patch
 
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:    netbeans >= 6.9
 BuildRequires:    wget
 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-harness
+BuildRequires:    netbeans-apisupport
 
-Requires:         netbeans >= 6.9
 Requires:         netbeans-platform >= 6.9
 Requires:         java >= 1.6.0 
 
@@ -78,6 +79,10 @@ 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
@@ -88,12 +93,10 @@ echo "
 
 # 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/jvisualvm.conf
-mv $RPM_BUILD_ROOT/%{_libdir}/visualvm/etc/visualvm.clusters $RPM_BUILD_ROOT/etc/jvisualvm.clusters
+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/
-#I did not found where this substitution is done. reverting it back.
-sed 's/APPNAME=visualvm/APPNAME=`basename "$0"`/g'  < $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm >  $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/visualvm
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/bin/jvisualvm
+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}
@@ -119,8 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %attr(0755,root,root) %{_bindir}/jvisualvm
 %{_libdir}/visualvm/
-%config(noreplace) /etc/jvisualvm.conf
-%config(noreplace) /etc/jvisualvm.clusters
+%config(noreplace) /etc/visualvm.conf
+%config(noreplace) /etc/visualvm.clusters
 %{_datadir}/applications/visualvm.desktop
 %doc README
 %doc INSTALL
@@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 24 2010 Jiri Vanek  <jvanek at redhat.com> - 1.3-10
+- resolves 667314
+
 * Wed Nov 24 2010 Jiri Vanek  <jvanek at redhat.com> - 1.3-9
 - updated license