[cinnamon] add policy file

leigh123linux leigh123linux at fedoraproject.org
Thu Oct 10 21:23:05 UTC 2013


commit 47562d91632ec020486ae3fdfd76e2efe951cc29
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 10 22:22:52 2013 +0100

    add policy file

 cinnamon.spec                      |   13 +++++++++++--
 org.cinnamon.settings-users.policy |   20 ++++++++++++++++++++
 replace_gksu.patch                 |    2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 798d610..8feab2e 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -13,6 +13,7 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/Cinnamon-%{version}.tar.gz
 Source1:        cinnamon-fedora.gschema.override
+Source2:        org.cinnamon.settings-users.policy
 
 Patch0:         background.patch
 Patch1:         autostart_nemo.patch
@@ -185,7 +186,11 @@ $RPM_BUILD_ROOT/%{_prefix}/lib/cinnamon-settings/bin/capi.py
 %endif
 
 # create directory for lang files
-install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/cinnamon/locale/
+install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/cinnamon/locale/
+
+# install policy file
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/
+install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/
 
 
 %postun
@@ -205,6 +210,7 @@ fi
 %{_datadir}/desktop-directories/*
 %{_datadir}/glib-2.0/schemas/*
 %{_datadir}/cinnamon-session/sessions/*
+%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy
 %{_datadir}/xsessions/*
 %{_datadir}/cinnamon/
 %{_libdir}/cinnamon/
@@ -214,6 +220,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 10 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-2
+- add policy file for "users and groups" setting
+
 * Wed Oct 09 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.2-1
 - update to 2.0.2
 - drop upstream patch
diff --git a/org.cinnamon.settings-users.policy b/org.cinnamon.settings-users.policy
new file mode 100644
index 0000000..a9e992e
--- /dev/null
+++ b/org.cinnamon.settings-users.policy
@@ -0,0 +1,20 @@
+<?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.cinnamon.settings-users">
+    <message>Authentication is required to run the Cinnamon Users and Groups</message>
+    <icon_name>system-users</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/lib/cinnamon-settings-users/cinnamon-settings-users.py</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
+
diff --git a/replace_gksu.patch b/replace_gksu.patch
index f532d70..891354a 100644
--- a/replace_gksu.patch
+++ b/replace_gksu.patch
@@ -5,5 +5,5 @@
  import os
  
 -os.system("gksu /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
-+os.system("beesu /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
++os.system("pkexec /usr/lib/cinnamon-settings-users/cinnamon-settings-users.py")
  


More information about the scm-commits mailing list