Tue Apr 24 00:01:27 UTC 2012

1 files changed, 11 insertions, 17 deletions

diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 60a330305..818d4e443 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $
+# $Id: PKGBUILD 156655 2012-04-22 13:28:46Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev')
+pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.6.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
@@ -38,6 +38,14 @@ package_wireshark-cli() {
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
   rm "${pkgdir}/usr/bin/wireshark"
+
+  # Headers
+  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
+    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+  done
 }
 
 package_wireshark-gtk() {
@@ -55,17 +63,3 @@ package_wireshark-gtk() {
   done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
-
-package_wireshark-dev() {
-  pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files"
-  depends=('wireshark-cli')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
-
-  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
-  done
-}