[visualvm] Use app specific icon (#549903).

[Ville Skyttä]

commit 850d0b508b49872a9870a4209b495f1d4bf1a21e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 17 14:37:27 2011 +0200

    Use app specific icon (#549903).

 visualvm-1.3.3-icons.patch |   62 ++++++++++++++++++++++++++++++++++++++++++++
 visualvm.spec              |   19 ++++++++++++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/visualvm-1.3.3-icons.patch b/visualvm-1.3.3-icons.patch
new file mode 100644
index 0000000..067dfd2
--- /dev/null
+++ b/visualvm-1.3.3-icons.patch
@@ -0,0 +1,62 @@
+diff -up visualvm_harness-1.3/Makefile.am.icons visualvm_harness-1.3/Makefile.am
+--- visualvm_harness-1.3/Makefile.am.icons	2011-12-14 13:03:25.000000000 +0200
++++ visualvm_harness-1.3/Makefile.am	2011-12-15 20:57:48.257565436 +0200
+@@ -241,6 +241,9 @@ install-exec-local:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)
+ 	mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
+ 	mkdir -p $(DESTDIR)$(datadir)/applications
++	for i in 16 24 32 48; do \
++	  mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps; \
++	done
+ 	cat visualvm/launcher/visualvm | \
+ 	  sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
+ 	  sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
+@@ -256,6 +259,9 @@ install-exec-local:
+ 	cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
+ 	cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm	
+ 	cp visualvm.desktop $(DESTDIR)$(datadir)/applications
++	for i in 16 24 32 48; do \
++	  cp visualvm/startup/src/com/sun/tools/visualvm/modules/startup/resources/icon$$i.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps/visualvm.png; \
++	done
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(bindir)/jvisualvm
+@@ -263,6 +269,7 @@ uninstall-local:
+ 	rm -f $(DESTDIR)$(sysconfdir)/visualvm.clusters
+ 	rm -rf $(DESTDIR)$(libdir)/visualvm
+ 	rm -f $(DESTDIR)$(datadir)/applications/visualvm.desktop
++	rm -f $(DESTDIR)$(datadir)/icons/hicolor/*x*/apps/visualvm.png
+ 
+ download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
+ 
+diff -up visualvm_harness-1.3/Makefile.in.icons visualvm_harness-1.3/Makefile.in
+--- visualvm_harness-1.3/Makefile.in.icons	2011-12-14 13:05:47.000000000 +0200
++++ visualvm_harness-1.3/Makefile.in	2011-12-15 20:57:48.258565529 +0200
+@@ -685,6 +685,9 @@ install-exec-local:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)
+ 	mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
+ 	mkdir -p $(DESTDIR)$(datadir)/applications
++	for i in 16 24 32 48; do \
++	  mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps; \
++	done
+ 	cat visualvm/launcher/visualvm | \
+ 	  sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
+ 	  sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
+@@ -700,6 +703,9 @@ install-exec-local:
+ 	cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
+ 	cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm	
+ 	cp visualvm.desktop $(DESTDIR)$(datadir)/applications
++	for i in 16 24 32 48; do \
++	  cp visualvm/startup/src/com/sun/tools/visualvm/modules/startup/resources/icon$$i.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps/visualvm.png; \
++	done
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(bindir)/jvisualvm
+@@ -707,6 +713,7 @@ uninstall-local:
+ 	rm -f $(DESTDIR)$(sysconfdir)/visualvm.clusters
+ 	rm -rf $(DESTDIR)$(libdir)/visualvm
+ 	rm -f $(DESTDIR)$(datadir)/applications/visualvm.desktop
++	rm -f $(DESTDIR)$(datadir)/icons/hicolor/*x*/apps/visualvm.png
+ 
+ download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
+ 
diff --git a/visualvm.spec b/visualvm.spec
index 1306b16..6b68bb8 100644
--- a/visualvm.spec
+++ b/visualvm.spec
@@ -3,7 +3,7 @@
 
 Name:       visualvm    
 Version:    1.3.3
-Release:    %{visualvmharnessver}.0%{?dist}
+Release:    %{visualvmharnessver}.1%{?dist}
 Summary:    Lightweight profiler that integrates many command-line JDK tools
 
 Group:      Development/Tools  
@@ -12,6 +12,7 @@ URL:        http://visualvm.dev.java.net/
 Source0:    %{dwnldurl}/visualvm_harness-%{visualvmharnessver}.tar.gz
 Source1:    %{dwnldurl}/visualvm_133-src.tar.gz
 Source2:    %{dwnldurl}/netbeans-profiler-visualvm_release701.tar.gz
+Patch0:     visualvm-1.3.3-icons.patch
 
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -40,6 +41,7 @@ performance analysis for the Java SE platform.
 
 %prep
 %setup -q -n visualvm_harness-%{visualvmharnessver}
+%patch0 -p1
 
 %build
 ./configure --prefix=/usr \
@@ -66,6 +68,17 @@ echo "
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -74,12 +87,16 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/visualvm.conf
 %config(noreplace) /etc/visualvm.clusters
 %{_datadir}/applications/visualvm.desktop
+%{_datadir}/icons/hicolor/*x*/apps/visualvm.png
 %doc README
 %doc INSTALL
 %doc COPYING
 
 
 %changelog
+* Sat Dec 17 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-1.3.1
+- Use app specific icon (#549903).
+
 * Wed Dec 14 2011 Jiri Vanek  <jvanek at redhat.com> - 1.3.3-1.3.0
 - updated for hearness 1.3