From 05e3acd07308e09e4e344c25a83d51ecf846ded5553f6a82475410fb1d9757dd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 24 Apr 2017 08:38:27 +0000 Subject: [PATCH 1/2] Accepting request 487824 from home:zhangxiaofei:branches:GNOME:Factory - Add gnome-control-center-more-power-button-actions.patch: Bring back the "shutdown" and "interactive" power key actions in "Power" panel (bsc#993381). OBS-URL: https://build.opensuse.org/request/show/487824 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=345 --- ...trol-center-more-power-button-actions.patch | 18 ++++++++++++++++++ gnome-control-center.changes | 7 +++++++ gnome-control-center.spec | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 gnome-control-center-more-power-button-actions.patch diff --git a/gnome-control-center-more-power-button-actions.patch b/gnome-control-center-more-power-button-actions.patch new file mode 100644 index 0000000..ff069fb --- /dev/null +++ b/gnome-control-center-more-power-button-actions.patch @@ -0,0 +1,18 @@ +diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c +index e631e0b..fed19dd 100644 +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -2020,9 +2020,11 @@ populate_power_button_model (GtkTreeModel *model) + char *name; + GsdPowerButtonActionType value; + } actions[] = { +- { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND }, + { N_("Hibernate"), GSD_POWER_BUTTON_ACTION_HIBERNATE }, +- { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING } ++ { N_("Interactive"), GSD_POWER_BUTTON_ACTION_INTERACTIVE}, ++ { N_("Nothing"), GSD_POWER_BUTTON_ACTION_NOTHING }, ++ { N_("Shutdown"), GSD_POWER_BUTTON_ACTION_SHUTDOWN }, ++ { N_("Suspend"), GSD_POWER_BUTTON_ACTION_SUSPEND } + }; + guint i; + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index e713958..424e2c4 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 13 09:47:27 UTC 2017 - fezhang@suse.com + +- Add gnome-control-center-more-power-button-actions.patch: + Bring back the "shutdown" and "interactive" power key actions in + "Power" panel (bsc#993381). + ------------------------------------------------------------------- Mon Mar 20 13:08:28 UTC 2017 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 4888994..2056dfc 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -50,6 +50,8 @@ Patch18: gnome-control-center-890979-change-remote-passwd.patch Patch20: gnome-control-center-disable-error-message-for-NM.patch # PATCH-FIX-OPENSUSE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer. Patch21: gnome-control-center-info-never-use-gnome-software.patch +# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions. +Patch22: gnome-control-center-more-power-button-actions.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -215,6 +217,7 @@ translation-update-upstream %if 0%{?suse_version} == 1315 %patch21 -p1 %endif +%patch22 -p1 %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh From 6580bf74204c00c5a5c2f519c4cfb27917ac33853b97826c783599d833584a09 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Apr 2017 08:01:41 +0000 Subject: [PATCH 2/2] Accepting request 490810 from home:dimstar:branches:GNOME:Factory Update to 3.24.1 OBS-URL: https://build.opensuse.org/request/show/490810 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=346 --- gnome-control-center-3.24.0.tar.xz | 3 --- gnome-control-center-3.24.1.tar.xz | 3 +++ gnome-control-center.changes | 8 ++++++++ gnome-control-center.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 gnome-control-center-3.24.0.tar.xz create mode 100644 gnome-control-center-3.24.1.tar.xz diff --git a/gnome-control-center-3.24.0.tar.xz b/gnome-control-center-3.24.0.tar.xz deleted file mode 100644 index edb8bc2..0000000 --- a/gnome-control-center-3.24.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8de5ea79068e2d6b441db8c41a64bd983dedaeba71c2351505a71b527e77d9e2 -size 7340200 diff --git a/gnome-control-center-3.24.1.tar.xz b/gnome-control-center-3.24.1.tar.xz new file mode 100644 index 0000000..8ca5d1a --- /dev/null +++ b/gnome-control-center-3.24.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30cc8e19fdddf4bde7607fa3897bbba837659e1df9db0de8741723053889a53c +size 7343036 diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 424e2c4..09c0892 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 24 16:56:35 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.24.1: + + Fix check for existing shortcut settings. + + Fix possible crash when exiting Printers panel. + + Fix blurry icons in night light dialogue. + ------------------------------------------------------------------- Thu Apr 13 09:47:27 UTC 2017 - fezhang@suse.com diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 2056dfc..c3b901d 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -29,7 +29,7 @@ %define with_cacert_patch 0 Name: gnome-control-center -Version: 3.24.0 +Version: 3.24.1 Release: 0 Summary: The GNOME Control Center License: GPL-2.0+