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

[Balló György]

    Date: Saturday, January 11, 2014 @ 21:36:28
  Author: bgyorgy
Revision: 103821

upgpkg: ettercap 0.8.0-2

Remove obsoleted polkit stuff (upstream has correct pkexec implementation), replace polkit-gnome with polkit in optdepends (FS#36859)

Modified:
  ettercap/trunk/PKGBUILD
Deleted:
  ettercap/trunk/ettercap-gtk.install

----------------------+
 PKGBUILD             |   21 ++-------------------
 ettercap-gtk.install |   14 --------------
 2 files changed, 2 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-11 20:15:05 UTC (rev 103820)
+++ PKGBUILD	2014-01-11 20:36:28 UTC (rev 103821)
@@ -5,7 +5,7 @@
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
@@ -48,25 +48,8 @@
   backup=('etc/ettercap/etter.conf')
   conflicts=('ettercap')
   provides=('ettercap')
-  optdepends=('polkit-gnome')
-  install='ettercap-gtk.install'
+  optdepends=('polkit: to run ettercap directly from menu')
 
-  install -d $pkgdir/usr/share/polkit-1/actions/
   cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   make DESTDIR="${pkgdir}" install
-
-#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop"
-#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg"
-
-  # Install policy file
-  #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy"
-
-  # We need rename the original script
-  #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf"
-
-  # Install launcher script
-  #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap
-  #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap
-  #chmod 755 ${pkgdir}/usr/bin/ettercap
-
 }

Deleted: ettercap-gtk.install
===================================================================
--- ettercap-gtk.install	2014-01-11 20:15:05 UTC (rev 103820)
+++ ettercap-gtk.install	2014-01-11 20:36:28 UTC (rev 103821)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo 'If you use a lightweight windowmanager, remember to run'
-  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
-  echo 'graphical authentication, which may be needed for pkexec to work.'
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}