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

[Ionut Biru]

    Date: Friday, January 13, 2012 @ 14:44:25
  Author: ibiru
Revision: 146573

update to 1.6.5

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

-----------------------+
 PKGBUILD              |   26 +++++++++++++-------------
 wireshark-gtk.install |    3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-13 16:55:27 UTC (rev 146572)
+++ PKGBUILD	2012-01-13 19:44:25 UTC (rev 146573)
@@ -3,18 +3,18 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
-pkgver=1.6.4
+pkgver=1.6.5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('a348521c514fcdd890d974f2a0b59db3')
+source=(http://www.wireshark.org/download/src/$pkgbase-$pkgver.tar.bz2)
+md5sums=('794948a10d387fc8e37d824ea11dbac9')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   ./configure \
       --prefix=/usr \
@@ -30,28 +30,28 @@
   install=wireshark.install
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark"
+  chgrp 150 "$pkgdir/usr/bin/dumpcap"
+  chmod 754 "$pkgdir/usr/bin/dumpcap"
+  rm "$pkgdir/usr/bin/wireshark"
 }
 
 package_wireshark-gtk() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend"
-  depends=('gtk2' 'wireshark-cli')
+  depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
   install=wireshark-gtk.install
   replaces=(wireshark)
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
 
   install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
   for d in 16 32 48; do
-      install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
+      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
+  install -Dm644 wireshark.desktop "$pkgdir/usr/share/applications/wireshark.desktop"
 }

Modified: wireshark-gtk.install
===================================================================
--- wireshark-gtk.install	2012-01-13 16:55:27 UTC (rev 146572)
+++ wireshark-gtk.install	2012-01-13 19:44:25 UTC (rev 146573)
@@ -1,5 +1,6 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {