[arch-commits] Commit in gparted/trunk (3 files)

[Christian Hesse]

    Date: Tuesday, October 10, 2017 @ 20:53:22
  Author: eworm
Revision: 307402

upgpkg: gparted 0.30.0-2

update for upstream polkit changes

Modified:
  gparted/trunk/PKGBUILD
Deleted:
  gparted/trunk/gparted_polkit
  gparted/trunk/org.archlinux.pkexec.gparted.policy

-------------------------------------+
 PKGBUILD                            |   35 ++++++++++------------------------
 gparted_polkit                      |    6 -----
 org.archlinux.pkexec.gparted.policy |   20 -------------------
 3 files changed, 11 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-10 18:49:59 UTC (rev 307401)
+++ PKGBUILD	2017-10-10 20:53:22 UTC (rev 307402)
@@ -5,13 +5,13 @@
 
 pkgname=gparted
 pkgver=0.30.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
 license=('GPL')
 depends=('parted' 'gtkmm')
-makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
+makedepends=('intltool' 'pkg-config' 'gnome-doc-utils' 'polkit')
 optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'jfsutils: for jfs partitions'
             'f2fs-tools: for Flash-Friendly File System'
@@ -22,32 +22,22 @@
             'udftools: for UDF file system support'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
-            'polkit: to run gparted directly from menu'
+            'polkit: to run gparted from application menu'
             'gpart: for recovering corrupt partition tables'
             'mtools: utilities to access MS-DOS disks')
 validpgpkeys=('BB09FFB87563FA2E1A22146817A6D3FF338C9570') # "Curtis Gedak <gedakc at gmail.com>"
-source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'org.archlinux.pkexec.gparted.policy'
-        'gparted_polkit')
+source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig})
 sha256sums=('d31193effe058bdaeb2a4cd4b514ec753191179a0bc3abefda68a2b7975ecf4a'
-            'SKIP'
-            'c9fcdc9e0e0ec1d309d964c9768f9060a31e744926240985069c5e24e5e81ded'
-            '7b76a2f6708cdd788782206b59e2ebfc21122cc9c05ec2e3fa78bd1044c1e6d3')
+            'SKIP')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-              --sbindir=/usr/bin \
-              --enable-online-resize \
-              --enable-libparted-dmraid
-  make
+      --sbindir=/usr/bin \
+      --enable-online-resize \
+      --enable-libparted-dmraid
+  make all org.gnome.gparted.policy
 }
 
 package() {
@@ -56,10 +46,7 @@
   make DESTDIR="${pkgdir}" install
 
   # Install policy file
-  install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \
-                 "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
+  install -D -m0644 org.gnome.gparted.policy \
+      "${pkgdir}"/usr/share/polkit-1/actions/org.gnome.gparted.policy
 
-  # Install launcher script
-  install -m755 "${srcdir}/gparted_polkit" \
-                "${pkgdir}/usr/bin/gparted_polkit"
 }

Deleted: gparted_polkit
===================================================================
--- gparted_polkit	2017-10-10 18:49:59 UTC (rev 307401)
+++ gparted_polkit	2017-10-10 20:53:22 UTC (rev 307402)
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
-	pkexec --disable-internal-agent "/usr/bin/gparted" "$@"
-else
-	/usr/bin/gparted "$@"
-fi

Deleted: org.archlinux.pkexec.gparted.policy
===================================================================
--- org.archlinux.pkexec.gparted.policy	2017-10-10 18:49:59 UTC (rev 307401)
+++ org.archlinux.pkexec.gparted.policy	2017-10-10 20:53:22 UTC (rev 307402)
@@ -1,20 +0,0 @@
-<?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.gparted">
-    <message>Authentication is required to run the GParted Partition Editor</message>
-    <icon_name>gparted</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/gparted</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
-  </action>
-
-</policyconfig>
-