Hello community,
here is the log from the commit of package gnome-initial-setup for
openSUSE:Factory checked in at 2017-06-08 15:03:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-initial-setup (Old)
and /work/SRC/openSUSE:Factory/.gnome-initial-setup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-initial-setup"
Thu Jun 8 15:03:40 2017 rev:18 rq:501761 version:3.24.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-initial-setup/gnome-initial-setup.changes
2017-06-01 16:31:54.326137705 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-initial-setup.new/gnome-initial-setup.changes
2017-06-08 15:03:41.797150998 +0200
@@ -1,0 +2,7 @@
+Thu Jun 1 10:25:31 UTC 2017 - qz...@suse.com
+
+- Update gnome-initial-setup-only-setup-keyboard.patch
+ gnome-initial-setup-disable-dep-on-started-docs.patch: Porting
+ these patches to gnome-initial-setup version 3.24.2.
+
+-------------------------------------------------------------------
@@ -66,0 +74,25 @@
+
+-------------------------------------------------------------------
+Thu May 23 07:11:48 UTC 2016 - yfji...@suse.com
+
+- Add gnome-initial-setup-disable-dep-on-started-docs.patch:
+ Dismiss the yelp help page after the initial setup
+ (FATE#321126).
+
+-------------------------------------------------------------------
+Thu May 16 06:49:02 UTC 2016 - yfji...@suse.com
+
+- Add gnome-initial-setup-only-setup-keyboard.patch: Only setup the
+ keyboard and IM as required (FATE#321126).
+
+-------------------------------------------------------------------
+Fri May 10 11:14:47 UTC 2016 - qz...@suse.com
+
+- Add gnome-initial-setup-only-launch-CJK.patch: In SLED, it will
+ active if user's language is Chinese/Japanese/Korean, and
+ deactive in other language (FATE#321126).
+
+-------------------------------------------------------------------
+Wed May 8 09:37:13 UTC 2016 - qz...@suse.com
+
+- Import gnome-initial-setup to SLE12:SP3(FATE#321126, bsc#988350).
New:
----
gnome-initial-setup-disable-dep-on-started-docs.patch
gnome-initial-setup-only-launch-CJK.patch
gnome-initial-setup-only-setup-keyboard.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-initial-setup.spec ++++++
--- /var/tmp/diff_new_pack.EDKd2I/_old 2017-06-08 15:03:42.785011583 +0200
+++ /var/tmp/diff_new_pack.EDKd2I/_new 2017-06-08 15:03:42.789011018 +0200
@@ -24,6 +24,12 @@
Group: System/GUI/GNOME
Url: http://www.google.com
Source:
http://download.gnome.org/sources/gnome-initial-setup/3.24/%{name}-%{version}.tar.xz
+# PATCH-FIX-SLE gnome-initial-setup-only-launch-CJK.patch FATE#321126
qz...@suse.com -- Make gnome-initial-setup only work for CJK
+Patch0: gnome-initial-setup-only-launch-CJK.patch
+# PATCH-FIX-SLE gnome-initial-setup-only-setup-keyboard.patch FATE#321126
yfji...@suse.com -- Only launch the keyboard and IM setup
+Patch1: gnome-initial-setup-only-setup-keyboard.patch
+# PATCH-FIX-SLE gnome-initial-setup-disable-dep-on-started-docs.patch
FATE#321126 yfji...@suse.com -- Disable help dialog after g-i-s system to break
the dependency of gnome-getting-started-docs
+Patch2: gnome-initial-setup-disable-dep-on-started-docs.patch
BuildRequires: intltool >= 0.40
BuildRequires: krb5-devel
BuildRequires: vala
@@ -53,7 +59,9 @@
BuildRequires: pkgconfig(pwquality)
BuildRequires: pkgconfig(rest-0.7)
BuildRequires: pkgconfig(webkit2gtk-4.0)
+%if 0%{?is_opensuse}
Requires: gnome-getting-started-docs
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -62,6 +70,11 @@
%lang_package
%prep
%setup -q
+%if !0%{?is_opensuse}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%endif
%build
%configure
++++++ gnome-initial-setup-disable-dep-on-started-docs.patch ++++++
diff -Nura
gnome-initial-setup-3.24.2/gnome-initial-setup/gnome-initial-setup-copy-worker.c
gnome-initial-setup-3.24.2_new/gnome-initial-setup/gnome-initial-setup-copy-worker.c
---
gnome-initial-setup-3.24.2/gnome-initial-setup/gnome-initial-setup-copy-worker.c
2017-05-10 23:33:48.000000000 +0800
+++
gnome-initial-setup-3.24.2_new/gnome-initial-setup/gnome-initial-setup-copy-worker.c
2017-06-01 18:19:47.127676830 +0800
@@ -89,7 +89,6 @@
move_file_from_homedir (src, dest, path);
FILE (".config/gnome-initial-setup-done");
- FILE (".config/run-welcome-tour");
FILE (".config/dconf/user");
FILE (".config/goa-1.0/accounts.conf");
FILE (".local/share/keyrings/login.keyring");
++++++ gnome-initial-setup-only-launch-CJK.patch ++++++
Index: gnome-initial-setup-3.20.1/gnome-initial-setup/gnome-initial-setup.c
===================================================================
--- gnome-initial-setup-3.20.1.orig/gnome-initial-setup/gnome-initial-setup.c
+++ gnome-initial-setup-3.20.1/gnome-initial-setup/gnome-initial-setup.c
@@ -184,6 +184,30 @@ get_mode (void)
return GIS_DRIVER_MODE_NEW_USER;
}
+static gboolean
+language_is_CJK()
+{
+ gchar **env = g_get_environ ();
+ const gchar *value = g_environ_getenv (env, "LANG");
+
+ if (g_ascii_strcasecmp(value, "zh_CN.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_HK.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_TW.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_SG.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "ja_JP.UTF-8") &&
+ g_ascii_strcasecmp(value, "ko_KR.UTF-8")) {
+ g_strfreev(env);
+ return FALSE;
+ }
+ else {
+ g_strfreev(env);
+ return TRUE;
+ }
+}
+
int
main (int argc, char *argv[])
{
@@ -192,6 +216,9 @@ main (int argc, char *argv[])
GOptionContext *context;
GisDriverMode mode;
+ if (!language_is_CJK())
+ return status;
+
GOptionEntry entries[] = {
{ "existing-user", 0, 0, G_OPTION_ARG_NONE, &force_existing_user_mode,
_("Force existing user mode"), NULL },
++++++ gnome-initial-setup-only-setup-keyboard.patch ++++++
diff -Nura gnome-initial-setup-3.24.2/gnome-initial-setup/gnome-initial-setup.c
gnome-initial-setup-3.24.2_new/gnome-initial-setup/gnome-initial-setup.c
--- gnome-initial-setup-3.24.2/gnome-initial-setup/gnome-initial-setup.c
2017-06-01 14:43:53.772011715 +0800
+++ gnome-initial-setup-3.24.2_new/gnome-initial-setup/gnome-initial-setup.c
2017-06-01 14:47:30.912508998 +0800
@@ -62,17 +62,8 @@
#define PAGE(name, new_user_only) { #name, gis_prepare_ ## name ## _page,
new_user_only }
static PageData page_table[] = {
- PAGE (language, FALSE),
/* PAGE (region, FALSE), */
PAGE (keyboard, FALSE),
- PAGE (eula, FALSE),
- PAGE (network, FALSE),
- PAGE (privacy, FALSE),
- PAGE (timezone, TRUE),
- PAGE (software, TRUE),
- PAGE (goa, FALSE),
- PAGE (account, TRUE),
- PAGE (password, TRUE),
PAGE (summary, FALSE),
{ NULL },
};
