Accepting request 490927 from GNOME:Factory

Update to 3.24.1 (forwarded request 490810 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/490927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=152
This commit is contained in:
Dominique Leuenberger 2017-04-29 08:51:01 +00:00 committed by Git OBS Bridge
commit 53b22e9b97
5 changed files with 40 additions and 4 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8de5ea79068e2d6b441db8c41a64bd983dedaeba71c2351505a71b527e77d9e2
size 7340200

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30cc8e19fdddf4bde7607fa3897bbba837659e1df9db0de8741723053889a53c
size 7343036

View File

@ -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;

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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
- 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 Mon Mar 20 13:08:28 UTC 2017 - dimstar@opensuse.org

View File

@ -29,7 +29,7 @@
%define with_cacert_patch 0 %define with_cacert_patch 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.24.0 Version: 3.24.1
Release: 0 Release: 0
Summary: The GNOME Control Center Summary: The GNOME Control Center
License: GPL-2.0+ License: GPL-2.0+
@ -50,6 +50,8 @@ Patch18: gnome-control-center-890979-change-remote-passwd.patch
Patch20: gnome-control-center-disable-error-message-for-NM.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. # 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 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: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: fdupes BuildRequires: fdupes
@ -215,6 +217,7 @@ translation-update-upstream
%if 0%{?suse_version} == 1315 %if 0%{?suse_version} == 1315
%patch21 -p1 %patch21 -p1
%endif %endif
%patch22 -p1
%build %build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh