[arch-commits] Commit in ettercap/trunk (PKGBUILD ettercap.desktop)

[Eric Bélanger]

    Date: Tuesday, December 13, 2011 @ 17:16:30
  Author: eric
Revision: 144995

upgpkg: ettercap NG_0.7.4.2-1

Upstream update, Clean up depends, Fix icon location, Switch to upstream desktop file

Modified:
  ettercap/trunk/PKGBUILD
Deleted:
  ettercap/trunk/ettercap.desktop

------------------+
 PKGBUILD         |   28 ++++++++++++++--------------
 ettercap.desktop |    9 ---------
 2 files changed, 14 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-13 19:14:03 UTC (rev 144994)
+++ PKGBUILD	2011-12-13 22:16:30 UTC (rev 144995)
@@ -4,22 +4,21 @@
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.1
+pkgver=NG_0.7.4.2
 _origver=${pkgver/_/-}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet'
-         'pkgconfig' 'gtk2')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz"
-        'ettercap.desktop')
-md5sums=('c6ae5f86361a85a8e193051f594a74fa'
-         '2fb9c1fa838f33aab427865ae4fc93ac')
+makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
+md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
 
 build() {
   cd "${srcdir}"
-  
+  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
+
   cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
 
   cd ${pkgbase}-${_origver}
@@ -45,9 +44,8 @@
 
 package_ettercap() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
   backup=('etc/etter.conf')
-  options=('!libtool')
 
   cd "${srcdir}"/${pkgbase}-${_origver}
   make DESTDIR="${pkgdir}" install
@@ -55,16 +53,18 @@
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2')
+  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
   optdepends=('gksu: to run ettercap from the menu')
   install=ettercap-gtk.install
 
   cd "${srcdir}"/${pkgbase}-${_origver}-gtk
   install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 "${srcdir}"/ettercap.desktop \
+  install -Dm644 desktop/ettercap.desktop \
     "${pkgdir}"/usr/share/applications/ettercap.desktop
   install -Dm644 share/ettercap.png \
     "${pkgdir}"/usr/share/ettercap/ettercap.png
   install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/pixmaps/ettercap.xpm
+    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
+  install -Dm644 desktop/ettercap.svg \
+    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
 }

Deleted: ettercap.desktop
===================================================================
--- ettercap.desktop	2011-12-13 19:14:03 UTC (rev 144994)
+++ ettercap.desktop	2011-12-13 22:16:30 UTC (rev 144995)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=ettercap
-GenericName=Ettercap
-Comment=Multipurpose sniffer/interceptor/logger
-Icon=ettercap
-Exec=gksu "/usr/bin/ettercap --gtk"
-Terminal=false
-Categories=Application;Network;System;Security;GTK