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

[Guillaume Alaux]

    Date: Sunday, July 29, 2012 @ 06:20:09
  Author: guillaume
Revision: 164262

upgpkg: wireshark 1.8.1-1

Upstream release + #30845 #29987 fixed bugs

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

-------------------+
 PKGBUILD          |   12 +++++++++---
 wireshark.install |   12 ++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-29 10:17:22 UTC (rev 164261)
+++ PKGBUILD	2012-07-29 10:20:09 UTC (rev 164262)
@@ -3,7 +3,7 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -12,7 +12,7 @@
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3eca81253800a0089d0f957e75853b05')
+md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -61,7 +61,13 @@
 
   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
+
+  for d in 16 24 32 48 64 128 256 ; do
+    install -Dm644 image/WiresharkDoc-${d}.png \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+  done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }

Modified: wireshark.install
===================================================================
--- wireshark.install	2012-07-29 10:17:22 UTC (rev 164261)
+++ wireshark.install	2012-07-29 10:20:09 UTC (rev 164262)
@@ -1,18 +1,18 @@
 post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
 
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
     echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
 }
 
 post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
     
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
+    if /usr/bin/getent group wireshark >/dev/null 2>&1; then
+        /usr/sbin/groupdel wireshark
     fi
 }