[arch-commits] Commit in wireshark/trunk (PKGBUILD wireshark-gtk.install)

[Ionut Biru]

    Date: Saturday, September 18, 2010 @ 05:37:37
  Author: ibiru
Revision: 90864

use standard size icons in /usr/share/icons, use wireshark.desktop that comes with the app

Added:
  wireshark/trunk/wireshark-gtk.install
Modified:
  wireshark/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   14 ++++++++------
 wireshark-gtk.install |   11 +++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-18 07:26:30 UTC (rev 90863)
+++ PKGBUILD	2010-09-18 09:37:37 UTC (rev 90864)
@@ -10,10 +10,8 @@
 makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap')
 url="http://www.wireshark.org/"
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 wireshark.desktop wireshark.png)
-md5sums=('13b188baea23cdad40b7a55921384a77'
-         '504ede44c02b2a52f6cbd3bffdf93b8d'
-         'e771800a8c977fe223583a453bc27397')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('13b188baea23cdad40b7a55921384a77')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -33,8 +31,6 @@
 
   make DESTDIR="${pkgdir}" install
 
-  install -Dm644 "${srcdir}/wireshark.png" "${pkgdir}/usr/share/icons/wireshark.png"
-  install -Dm644 "${srcdir}/wireshark.desktop" "${pkgdir}/usr/share/applications/wireshark.desktop"
   #wireshark uid group is 150
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
@@ -44,10 +40,16 @@
 package_wireshark-gtk() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK version"
   depends=('gtk2' 'wireshark-cli')
+  install=wireshark-gtk.install
   replaces=(wireshark)
   conflicts=(wireshark)
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
+  for d in 16 32 48; do
+      install -d ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps
+      install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
+  done
+  install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
 }

Added: wireshark-gtk.install
===================================================================
--- wireshark-gtk.install	                        (rev 0)
+++ wireshark-gtk.install	2010-09-18 09:37:37 UTC (rev 90864)
@@ -0,0 +1,11 @@
+post_install() {
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}