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

[Levente Polyak]

    Date: Wednesday, October 11, 2017 @ 00:18:14
  Author: anthraxx
Revision: 262313

upgpkg: wireshark 2.4.2-1

Modified:
  wireshark/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-10 23:53:30 UTC (rev 262312)
+++ PKGBUILD	2017-10-11 00:18:14 UTC (rev 262313)
@@ -1,20 +1,21 @@
-$Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+
 pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
 pkgbase=wireshark
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.4.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
              'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-options=(!emptydirs)
+options=('!emptydirs')
 url='https://www.wireshark.org/'
 source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
         do_not_use_svn_version.patch)
-sha256sums=('02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd'
+sha256sums=('d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d'
             '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691')
 
 prepare() {
@@ -21,7 +22,7 @@
   cd ${pkgbase}-${pkgver}
 
   # Avoid ugly "svn rev unknown from unknown" version string
-  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+  patch -p1 < "${srcdir}/do_not_use_svn_version.patch"
 }
 
 build() {
@@ -54,17 +55,15 @@
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" uninstall-local
 
-  #wireshark uid group is 150
+  # wireshark uid group is 150
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
   rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
 
-  # Headers
-  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-
-  install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+  # headers
+  install -Dm 644 config.h register.h ws_diag_control.h ws_symbol_export.h -t "${pkgdir}/usr/include/${pkgbase}"
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+    install -Dm 644 ${d}/*.h -t "${pkgdir}/usr/include/${pkgbase}/${d}"
   done
 }
 
@@ -85,9 +84,8 @@
   conflicts=(wireshark)
 
   cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
-  install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
+  install -Dm 755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+  install -Dm 644 wireshark-gtk.desktop -t "${pkgdir}/usr/share/applications"
 }
 
 package_wireshark-qt() {
@@ -95,7 +93,8 @@
   depends=('desktop-file-utils' 'qt5-multimedia' 'wireshark-cli' 'wireshark-common')
 
   cd ${pkgbase}-${pkgver}
+  install -Dm 755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
+}
 
-  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}
+# vim: ts=2 sw=2 et: