Hello community,

here is the log from the commit of package rubygem-webyast-system for 
openSUSE:Factory checked in at 2013-08-27 21:10:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-webyast-system (Old)
 and      /work/SRC/openSUSE:Factory/.rubygem-webyast-system.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rubygem-webyast-system"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/rubygem-webyast-system/rubygem-webyast-system.changes
    2013-02-05 13:15:44.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.rubygem-webyast-system.new/rubygem-webyast-system.changes
       2013-08-27 21:22:27.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Aug 26 08:19:43 UTC 2013 - lsle...@suse.cz
+
+- restart WebYast when the plugin is uninstalled
+- 0.3.8
+
+-------------------------------------------------------------------
+Mon Apr 22 13:49:04 UTC 2013 - lsle...@suse.cz
+
+- support for the new polkit (Javascript rules file) (bnc#816478)
+- 0.3.7
+
+-------------------------------------------------------------------

Old:
----
  webyast-system-0.3.6.gem

New:
----
  40-default-webyast-system.rules
  webyast-system-0.3.8.gem

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rubygem-webyast-system.spec ++++++
--- /var/tmp/diff_new_pack.tQxCgc/_old  2013-08-27 21:22:28.000000000 +0200
+++ /var/tmp/diff_new_pack.tQxCgc/_new  2013-08-27 21:22:28.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package rubygem-webyast-system
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           rubygem-webyast-system
-Version:        0.3.6
+Version:        0.3.8
 Release:        0
 %define mod_name webyast-system
 %define mod_full_name %{mod_name}-%{version}
@@ -41,6 +41,7 @@
 Group:          Productivity/Networking/Web/Utilities
 Source:         %{mod_full_name}.gem
 Source1:        org.opensuse.yast.modules.yapi.system.policy
+Source2:        40-default-webyast-system.rules
 
 %package doc
 Summary:        RDoc documentation for %{mod_name}
@@ -80,6 +81,10 @@
 # Policies
 mkdir -p $RPM_BUILD_ROOT/usr/share/%{webyast_polkit_dir}
 install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/%{webyast_polkit_dir}
+%if %suse_version >= 1230
+mkdir -p $RPM_BUILD_ROOT/etc/polkit-1/rules.d/
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/etc/polkit-1/rules.d/
+%endif
 
 %webyast_build_restdoc
 
@@ -90,6 +95,7 @@
 # granted even after upgrading from old package (before renaming) (bnc#645310)
 # (see https://fedoraproject.org/wiki/Packaging/ScriptletSnippets#Syntax )
 %posttrans
+%if %suse_version < 1230
 # granting all permissions for the web user
 #FIXME don't silently fail
 /usr/sbin/grantwebyastrights --user %{webyast_user} --action grant --policy 
org.freedesktop.consolekit.system.stop >& /dev/null || true
@@ -102,10 +108,12 @@
 /usr/sbin/grantwebyastrights --user root --action grant --policy 
org.freedesktop.consolekit.system.stop-multiple-users >& /dev/null || true
 /usr/sbin/grantwebyastrights --user root --action grant --policy 
org.freedesktop.consolekit.system.restart >& /dev/null || true
 /usr/sbin/grantwebyastrights --user root --action grant --policy 
org.freedesktop.consolekit.system.restart-multiple-users >& /dev/null || true
+%endif
 
 %restart_webyast
 
 %postun
+%if %suse_version < 1230
 # don't remove the rights during package update ($1 > 0)
 # see https://fedoraproject.org/wiki/Packaging/ScriptletSnippets#Syntax for 
details
 if [ $1 -eq 0 ] ; then
@@ -114,6 +122,9 @@
   /usr/sbin/grantwebyastrights --user %{webyast_user} --action revoke --policy 
org.freedesktop.consolekit.system.restart >& /dev/null || true
   /usr/sbin/grantwebyastrights --user %{webyast_user} --action revoke --policy 
org.freedesktop.consolekit.system.restart-multiple-users >& /dev/null || true
 fi
+%endif
+
+%webyast_plugin_postun
 
 %files 
 %defattr(-,root,root,-)
@@ -124,6 +135,9 @@
 
 %dir /usr/share/%{webyast_polkit_dir}
 %attr(644,root,root) %config 
/usr/share/%{webyast_polkit_dir}/org.opensuse.yast.modules.yapi.system.policy
+%if %suse_version >= 1230
+/etc/polkit-1/rules.d/40-default-webyast-system.rules
+%endif
 
 %restart_script_name
 

++++++ 40-default-webyast-system.rules ++++++
// default permissions for "webyast" and "root" users

polkit.addRule(function(action, subject) {
  if ((action.id == "org.opensuse.yast.modules.yapi.system.reboot"
    || action.id == "org.opensuse.yast.modules.yapi.system.shutdown"
    ) && subject.user == "root"))
  {
    return polkit.Result.YES;
  }

  // permissions for actions done by webyast
  if ((action.id == "org.freedesktop.consolekit.system.stop"
    || action.id == "org.freedesktop.consolekit.system.stop-multiple-users"
    || action.id == "org.freedesktop.consolekit.system.restart"
    || action.id == "org.freedesktop.consolekit.system.restart-multiple-users"
    ) && subject.user == "webyast")
  {
    return polkit.Result.YES;
  }
});    

// vim: syntax=javascript

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to