Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon for openSUSE:Factory
checked in at 2021-02-17 18:12:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon"
Wed Feb 17 18:12:29 2021 rev:48 rq:873028 version:4.8.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2021-01-21
21:57:17.845855632 +0100
+++ /work/SRC/openSUSE:Factory/.cinnamon.new.28504/cinnamon.changes
2021-02-17 18:13:25.826033398 +0100
@@ -1,0 +2,8 @@
+Tue Feb 9 19:24:25 UTC 2021 - andy great <andythe_gr...@pm.me>
+
+- Add support_yast_settings.patch gh#linuxmint/cinnamon#9590 to fix
+ cinnamon-settings cannot invoke YaST commands.
+- Rebase cinnamon-settings-native.patch to use with the patch
+ support_yast_settings.patch.
+
+-------------------------------------------------------------------
New:
----
support_yast_settings.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon.spec ++++++
--- /var/tmp/diff_new_pack.Q9KtH8/_old 2021-02-17 18:13:26.450033909 +0100
+++ /var/tmp/diff_new_pack.Q9KtH8/_new 2021-02-17 18:13:26.454033912 +0100
@@ -29,7 +29,7 @@
Source1: README.Gsettings-overrides
# PATCH-FIX-OPENSUSE cinnamon-wheel-and-sbin-path sor.ale...@meowr.ru -- Make
full sbin paths and use wheel as a sudo group.
Patch1: %{name}-wheel-and-sbin-path.patch
-# PATCH-FIX-OPENSUSE cinnamon-settings-native.patch andythe_gr...@pm.me --
Remove foreign configuration tools and add openSUSE's native.
+# PATCH-FIX-OPENSUSE cinnamon-settings-native.patch andythe_gr...@pm.me
shenlebantongy...@gmail.com -- Remove foreign configuration tools and add
openSUSE's native.
Patch2: %{name}-settings-native.patch
# PATCH-FIX-OPENSUSE cinnamon-settings-xscreensaver-path.patch boo#960165
sor.ale...@meowr.ru -- Fix xscreensaver configs path.
Patch3: %{name}-settings-xscreensaver-path.patch
@@ -38,6 +38,8 @@
# PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch sor.ale...@meowr.ru --
Use IceWM as fallback.
Patch7: %{name}-fallback-icewm.patch
# For gnome-background-properties.
+# PATCH-FIX-OPENSUSE support_yast_settings.patch shenlebantongy...@gmail.com
gh#linuxmint/cinnamon#9590 -- Fix cinnamon-settings cannot invoke YaST commands.
+Patch8: support_yast_settings.patch
BuildRequires: cmake
BuildRequires: desktop-data-openSUSE-extra
BuildRequires: fdupes
@@ -172,6 +174,7 @@
%patch3 -p1
%patch4 -p1
%patch7 -p1
+%patch8 -p1
cp -a %{SOURCE1} .
for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py
files%{_datadir}/%{name}/%{name}-looking-glass/*.py \
++++++ cinnamon-settings-native.patch ++++++
--- /var/tmp/diff_new_pack.Q9KtH8/_old 2021-02-17 18:13:26.490033941 +0100
+++ /var/tmp/diff_new_pack.Q9KtH8/_new 2021-02-17 18:13:26.490033941 +0100
@@ -1,10 +1,11 @@
-diff -ruN a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
---- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
2020-11-26 22:18:02.000000000 +0700
-+++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
2020-12-05 23:47:40.680505413 +0700
-@@ -76,23 +76,20 @@
+diff -ruN a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
c/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+--- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
2021-01-13 21:22:39.000000000 +0700
++++ c/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
2021-02-10 02:21:32.019809692 +0700
+@@ -75,24 +75,21 @@
+ ]
STANDALONE_MODULES = [
- # Label Executable
Icon Category Keywords for filter
+- # Label Executable
Icon Category Keywords for filter
- [_("Printers"), "system-config-printer",
"cs-printer", "hardware", _("printers, laser, inkjet")],
- [_("Firewall"), "gufw",
"cs-firewall", "admin", _("firewall, block, filter,
programs")],
- [_("Firewall"), "firewall-config",
"cs-firewall", "admin", _("firewall, block, filter,
programs")],
@@ -22,20 +23,21 @@
- [_("Blueman"), "blueman-manager",
"cs-bluetooth", "hardware", _("bluetooth, dongle, transfer,
mobile")],
- [_("Manage Services and Units"), "systemd-manager-pkexec",
"cs-sources", "admin", _("systemd, units, services,
systemctl, init")],
- [_("Disks"), "gnome-disks",
"org.gnome.DiskUtility", "hardware", _("disks, manage, hardware,
management, hard, hdd, pendrive, format, erase, test, create, iso, ISO, disk,
image")]
-+ [_("Printers"), "xdg-su -c '/sbin/yast2 printer'",
"cs-printer", "hardware", _("printers, laser, inkjet")],
-+ [_("Firewall"), "xdg-su -c '/sbin/yast2 firewall'",
"cs-firewall", "admin", _("firewall, block, filter,
programs")],
-+ [_("Languages"), "xdg-su -c '/sbin/yast2 language'",
"cs-language", "prefs", _("language, install,
foreign")],
-+ [_("Input Method"), "mintlocale-im",
"cs-input-method", "prefs", _("language, install,
foreign, input, method, chinese, korean, japanese, typing")],
-+ [_("Login Window"), "pkexec lightdm-settings",
"cs-login", "admin", _("login, lightdm, mdm, gdm,
manager, user, password, startup, switch")],
-+ [_("Login Window"),
"lightdm-gtk-greeter-settings-pkexec", "cs-login", "admin",
_("login, lightdm, manager, settings, editor")],
-+ [_("Driver Manager"), "xdg-su -c '/sbin/yast2 hwinfo'",
"cs-drivers", "admin", _("video, driver, wifi, card,
hardware, proprietary, nvidia, radeon, nouveau, fglrx")],
-+ [_("Nvidia Settings"), "nvidia-settings",
"cs-drivers", "admin", _("video, driver,
proprietary, nvidia, settings")],
-+ [_("Software Sources"), "xdg-su -c '/sbin/yast2
repositories'", "cs-sources", "admin", _("ppa,
repository, package, source, download")],
-+ [_("Package Management"), "xdg-su -c '/sbin/yast2 sw_single'",
"cs-sources", "admin", _("update, install,
repository, package, source, download")],
-+ [_("Users and Groups"), "cinnamon-settings-users",
"cs-user-accounts", "admin", _("user, users, account,
accounts, group, groups, password")],
-+ [_("Bluetooth"), "blueberry",
"cs-bluetooth", "hardware", _("bluetooth, dongle,
transfer, mobile")],
-+ [_("Manage Services and Units"), "xdg-su -c '/sbin/yast2
services-manager'", "cs-sources", "admin", _("systemd,
units, services, systemctl, init")],
-+ [_("Disks"), "xdg-su -c '/sbin/yast2
partitioner'", "org.gnome.DiskUtility", "hardware", _("disks,
manage, hardware, management, hard, hdd, pendrive, format, erase, test, create,
iso, ISO, disk, image")]
++ # Label Executable
Icon Category Keywords for filter
++ [_("Printers"), "xdg-su -c /sbin/yast2 printer",
"cs-printer", "hardware", _("printers, laser, inkjet")],
++ [_("Firewall"), "xdg-su -c /sbin/yast2 firewall",
"cs-firewall", "admin", _("firewall, block, filter,
programs")],
++ [_("Languages"), "xdg-su -c /sbin/yast2 language",
"cs-language", "prefs", _("language, install,
foreign")],
++ [_("Input Method"), "mintlocale-im",
"cs-input-method", "prefs", _("language, install,
foreign, input, method, chinese, korean, japanese, typing")],
++ [_("Login Window"), "pkexec lightdm-settings",
"cs-login", "admin", _("login, lightdm, mdm,
gdm, manager, user, password, startup, switch")],
++ [_("Login Window"),
"lightdm-gtk-greeter-settings-pkexec", "cs-login",
"admin", _("login, lightdm, manager, settings, editor")],
++ [_("Driver Manager"), "xdg-su -c /sbin/yast2 hwinfo",
"cs-drivers", "admin", _("video, driver, wifi, card,
hardware, proprietary, nvidia, radeon, nouveau, fglrx")],
++ [_("Nvidia Settings"), "nvidia-settings",
"cs-drivers", "admin", _("video, driver,
proprietary, nvidia, settings")],
++ [_("Software Sources"), "xdg-su -c /sbin/yast2
repositories", "cs-sources", "admin", _("ppa,
repository, package, source, download")],
++ [_("Package Management"), "xdg-su -c /sbin/yast2 sw_single",
"cs-sources", "admin", _("update, install, repository,
package, source, download")],
++ [_("Users and Groups"), "cinnamon-settings-users",
"cs-user-accounts", "admin", _("user, users,
account, accounts, group, groups, password")],
++ [_("Bluetooth"), "blueberry",
"cs-bluetooth", "hardware", _("bluetooth, dongle,
transfer, mobile")],
++ [_("Manage Services and Units"), "xdg-su -c /sbin/yast2
services-manager", "cs-sources", "admin", _("systemd,
units, services, systemctl, init")],
++ [_("Disks"), "xdg-su -c /sbin/yast2 partitioner",
"org.gnome.DiskUtility", "hardware", _("disks, manage, hardware,
management, hard, hdd, pendrive, format, erase, test, create, iso, ISO, disk,
image")]
]
TABS = {
++++++ support_yast_settings.patch ++++++
diff -ruN a/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
b/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
--- a/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
2021-01-13 21:22:39.000000000 +0700
+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
2021-02-10 02:14:29.516667849 +0700
@@ -213,7 +213,7 @@
self.module.loaded = True
if self.is_standalone:
- subprocess.Popen(self.exec_name.split())
+ subprocess.Popen(self.exec_name.split(' ',2))
return
# Add our own widgets
