Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/drbd/PKGBUILD
	extra/feh/PKGBUILD
	extra/samba/PKGBUILD
	libre/syslinux/PKGBUILD
	social/batctl/PKGBUILD

3 files changed, 43 insertions, 7 deletions

diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index d1d24c446..3047069fd 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=gsmartcontrol
 pkgver=0.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
 depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('gnomesu: for gsmartcontrol-root' 
-            'gksu: for gsmartcontrol-root')
+optdepends=('polkit: to run gparted directly from menu')
 install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30')
-
+source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 org.archlinux.pkexec.gsmartcontrol.policy gsmartcontrol.desktop)
+md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30'
+         'e7b9380849cdcaa4356a42559ea7954f'
+         '19b20293a639e51fa2abb929a3faae01')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,4 +30,12 @@ package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
 	make DESTDIR=${pkgdir} install
-}
+
+        # Install pexec fixed desktop file
+        install -Dm755 $srcdir/gsmartcontrol.desktop $pkgdir/usr/share/applications/gsmartcontrol.desktop
+
+        # Install pexec file
+        install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
+        $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy 
+
+      }
diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop
new file mode 100644
index 000000000..e65a26ef6
--- /dev/null
+++ b/community/gsmartcontrol/gsmartcontrol.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=GSmartControl
+GenericName=Hard Disk Health Inspection
+Comment=Monitor and control SMART data on hard disks
+Icon=gsmartcontrol
+Exec=pkexec /usr/bin/gsmartcontrol
+Type=Application
+Categories=GTK;GNOME;System;Filesystem;
diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
new file mode 100644
index 000000000..fb985df87
--- /dev/null
+++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="org.archlinux.pkexec.gsmartcontrol">
+    <message>Authentication is required to run the gsmartcontrol</message>
+    <icon_name>gsmartcontrol</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>