forked from pool/gnome-control-center
Accepting request 428437 from home:zhangxiaofei:branches:GNOME:Factory
- Rebase gnome-control-center-890979-change-remote-passwd.patch on 3.21.92. - Add gnome-control-center-info-never-use-gnome-software.patch: On SLE12-SP2 and Leap42.2, never search for gnome-software as an option when checking for updates in info panel, because we use gpk-update-viewer (bsc#999336). - Changelog: + Remove duplicate addtion of gnome-control-center-890979-change-remote-passwd.patch: already in the entry "Tue Sep 23 22:32:24 UTC 2014 - dliang@suse.com" + Remove redundant entry of "Update to GNOME 3.20.x Fate#318572", just to get around IBS changelog checkers and not really informative. OBS-URL: https://build.opensuse.org/request/show/428437 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=332
This commit is contained in:
parent
febfc9f374
commit
ab74959155
@ -1,10 +1,11 @@
|
||||
diff -Nur gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c
|
||||
--- gnome-control-center-3.10.3.bak/panels/user-accounts/um-user-panel.c 2014-09-24 06:25:22.293935423 +0800
|
||||
+++ gnome-control-center-3.10.3/panels/user-accounts/um-user-panel.c 2014-09-24 06:27:53.801939024 +0800
|
||||
@@ -687,7 +687,10 @@
|
||||
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
|
||||
index 4f11a0a..1bb7738 100644
|
||||
--- a/panels/user-accounts/um-user-panel.c
|
||||
+++ b/panels/user-accounts/um-user-panel.c
|
||||
@@ -900,7 +900,10 @@ show_user (ActUser *user, CcUserPanelPrivate *d)
|
||||
|
||||
widget = get_widget (d, "account-password-button");
|
||||
um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), get_password_mode_text (user));
|
||||
widget = get_widget (d, "account-password-button-label");
|
||||
gtk_label_set_label (GTK_LABEL (widget), get_password_mode_text (user));
|
||||
+/* Enable the remote account also.
|
||||
enable = act_user_is_local_account (user);
|
||||
+*/
|
||||
|
25
gnome-control-center-info-never-use-gnome-software.patch
Normal file
25
gnome-control-center-info-never-use-gnome-software.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 0884359b9fe093f4023ee404274ed3cdf76b857e Mon Sep 17 00:00:00 2001
|
||||
From: Felix Zhang <fezhang@suse.com>
|
||||
Date: Sat, 17 Sep 2016 00:33:20 +0800
|
||||
Subject: [PATCH] info: never use gnome-software
|
||||
|
||||
---
|
||||
panels/info/cc-info-panel.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
|
||||
index ad89d54..d904f6c 100644
|
||||
--- a/panels/info/cc-info-panel.c
|
||||
+++ b/panels/info/cc-info-panel.c
|
||||
@@ -1512,7 +1512,7 @@ info_panel_setup_overview (CcInfoPanel *self)
|
||||
static gboolean
|
||||
does_gnome_software_exist (void)
|
||||
{
|
||||
- return g_file_test (BINDIR "/gnome-software", G_FILE_TEST_EXISTS);
|
||||
+ return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
--
|
||||
2.6.6
|
||||
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 18 05:47:23 UTC 2016 - fezhang@suse.com
|
||||
|
||||
- Rebase gnome-control-center-890979-change-remote-passwd.patch on
|
||||
3.21.92.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 16 16:52:17 UTC 2016 - fezhang@suse.com
|
||||
|
||||
- Add gnome-control-center-info-never-use-gnome-software.patch:
|
||||
On SLE12-SP2 and Leap42.2, never search for gnome-software as an
|
||||
option when checking for updates in info panel, because we use
|
||||
gpk-update-viewer (bsc#999336).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 13 20:23:53 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
@ -169,11 +183,6 @@ Mon May 30 08:26:00 UTC 2016 - fcrozat@suse.com
|
||||
provided by it). Add Supplements to ensure it will be pulled when
|
||||
gnome-online-accounts is installed. (FATE#318572)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 26 08:47:25 UTC 2016 - fezhang@suse.com
|
||||
|
||||
- Update to GNOME 3.20.2 Fate#318572
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 20 15:38:00 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
@ -275,12 +284,6 @@ Mon Mar 21 14:45:14 UTC 2016 - dimstar@opensuse.org
|
||||
- Update to version 3.20.0:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 20 15:31:11 UTC 2016 - fezhang@suse.com
|
||||
|
||||
- Add gnome-control-center-890979-change-remote-passwd.patch:
|
||||
Enable remote user to change password in user panel (bsc#890979).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 17 14:37:24 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
@ -930,8 +933,8 @@ Wed Sep 24 04:53:24 UTC 2014 - badshah400@gmail.com
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 22:32:24 UTC 2014 - dliang@suse.com
|
||||
|
||||
- Add gnome-control-center-890979-change-remote-passwd.patch
|
||||
(bnc#890979)
|
||||
- Add gnome-control-center-890979-change-remote-passwd.patch:
|
||||
Enable remote user to change password in user panel (bsc#890979).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 22 17:09:55 UTC 2014 - zaitor@opensuse.org
|
||||
|
@ -48,6 +48,8 @@ Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
|
||||
Patch18: gnome-control-center-890979-change-remote-passwd.patch
|
||||
# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running
|
||||
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
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
@ -210,6 +212,9 @@ translation-update-upstream
|
||||
%patch18 -p1
|
||||
%endif
|
||||
%patch20 -p1
|
||||
%if 0%{?suse_version} == 1315
|
||||
%patch21 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
|
||||
|
Loading…
Reference in New Issue
Block a user