From 06f5e4fd8fe094b3a48d0d5e5359ae0eb026e89aef685e092250af5083b5e514 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 9 Jan 2013 14:37:01 +0000
Subject: [PATCH] Accepting request 147391 from
 home:StefanBruens:branches:Base:System

fix fdo#58629
same as MR#1196 against openSUSE_12.2:Update

OBS-URL: https://build.opensuse.org/request/show/147391
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=24
---
 fix_polkit_action_name.diff | 53 +++++++++++++++++++++++++++++++++++++
 udisks2.changes             |  6 +++++
 udisks2.spec                |  2 ++
 3 files changed, 61 insertions(+)
 create mode 100644 fix_polkit_action_name.diff

diff --git a/fix_polkit_action_name.diff b/fix_polkit_action_name.diff
new file mode 100644
index 0000000..1292a58
--- /dev/null
+++ b/fix_polkit_action_name.diff
@@ -0,0 +1,53 @@
+diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
+index 9582346..e3ae93f 100644
+--- a/src/udiskslinuxpartition.c
++++ b/src/udiskslinuxpartition.c
+@@ -269,7 +269,7 @@ handle_set_flags (UDisksPartition        *partition,
+     }
+   else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
+     {
+-      action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
++      action_id = "org.freedesktop.udisks2.modify-device-other-seat";
+     }
+ 
+   if (!udisks_daemon_util_check_authorization_sync (daemon,
+@@ -414,7 +414,7 @@ handle_set_name (UDisksPartition        *partition,
+     }
+   else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
+     {
+-      action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
++      action_id = "org.freedesktop.udisks2.modify-device-other-seat";
+     }
+ 
+   if (!udisks_daemon_util_check_authorization_sync (daemon,
+@@ -596,7 +596,7 @@ handle_set_type (UDisksPartition        *partition,
+     }
+   else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
+     {
+-      action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
++      action_id = "org.freedesktop.udisks2.modify-device-other-seat";
+     }
+ 
+   if (!udisks_daemon_util_check_authorization_sync (daemon,
+@@ -769,7 +769,7 @@ handle_delete (UDisksPartition        *partition,
+     }
+   else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
+     {
+-      action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
++      action_id = "org.freedesktop.udisks2.modify-device-other-seat";
+     }
+ 
+   if (!udisks_daemon_util_check_authorization_sync (daemon,
+diff --git a/src/udiskslinuxpartitiontable.c b/src/udiskslinuxpartitiontable.c
+index 8f0d3d9..b553625 100644
+--- a/src/udiskslinuxpartitiontable.c
++++ b/src/udiskslinuxpartitiontable.c
+@@ -336,7 +336,7 @@ handle_create_partition (UDisksPartitionTable   *table,
+     }
+   else if (!udisks_daemon_util_on_same_seat (daemon, object, caller_pid))
+     {
+-      action_id = "org.freedesktop.udisks2.modify-device-system-other-seat";
++      action_id = "org.freedesktop.udisks2.modify-device-other-seat";
+     }
+ 
+   if (!udisks_daemon_util_check_authorization_sync (daemon,
diff --git a/udisks2.changes b/udisks2.changes
index c2e62f2..ce79783 100644
--- a/udisks2.changes
+++ b/udisks2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 07 13:30:34 UTC 2013 - stefan.bruens@rwth-aachen.de
+
+- Fix name of polkit action (fdo#58629):
+  modify-device-system-other-seat -> modify-device-other-seat
+
 -------------------------------------------------------------------
 Sun Jan  6 21:02:27 UTC 2013 - dimstar@opensuse.org
 
diff --git a/udisks2.spec b/udisks2.spec
index 8382c47..b7d4474 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -27,6 +27,8 @@ License:        GPL-2.0+
 Group:          System/Daemons
 Url:            http://www.freedesktop.org/wiki/Software/udisks
 Source:         http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM fix_polkit_action_name.diff [fdo#58629]
+Patch0:         fix_polkit_action_name.diff
 # Needed to build the man pages
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gobject-introspection-devel