Hello community, here is the log from the commit of package gnome-initial-setup for openSUSE:Factory checked in at 2018-03-28 10:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-initial-setup (Old) and /work/SRC/openSUSE:Factory/.gnome-initial-setup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-initial-setup" Wed Mar 28 10:34:01 2018 rev:24 rq:591730 version:3.28.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-initial-setup/gnome-initial-setup.changes 2018-03-14 19:40:32.997979402 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-initial-setup.new/gnome-initial-setup.changes 2018-03-28 10:34:05.939181243 +0200 @@ -1,0 +2,15 @@ +Tue Mar 27 01:45:40 UTC 2018 - yfjiang@suse.com + +- Rebase gnome-initial-setup-disable-dep-on-started-docs.patch: The + run-welcome-tour stamp file is moved to a global function as + stated in bgo#777707. +- Enable the following patches on Leap 42.3, Leap 15 and + later, being consistent with SLE (boo#1086056): + + gnome-initial-setup-only-launch-CJK.patch + + gnome-initial-setup-only-setup-keyboard.patch + + gnome-initial-setup-disable-dep-on-started-docs.patch +- Remove the dependency of gnome-getting-started-docs on Leap, being + consistent with SLE (boo#1086056). +- Url link fix in spec. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-initial-setup.spec ++++++ --- /var/tmp/diff_new_pack.GNolD3/_old 2018-03-28 10:34:07.095139666 +0200 +++ /var/tmp/diff_new_pack.GNolD3/_new 2018-03-28 10:34:07.107139235 +0200 @@ -22,13 +22,13 @@ Summary: GNOME Initial Setup Assistant License: GPL-2.0-or-later Group: System/GUI/GNOME -URL: http://www.google.com +Url: https://wiki.gnome.org/Design/OS/InitialSetup Source: http://download.gnome.org/sources/gnome-initial-setup/3.28/%{name}-%{version}.tar.xz # PATCH-FEATURE-SLE gnome-initial-setup-only-launch-CJK.patch FATE#321126 qzhao@suse.com -- Make gnome-initial-setup only work for CJK Patch0: gnome-initial-setup-only-launch-CJK.patch # PATCH-FEATURE-SLE gnome-initial-setup-only-setup-keyboard.patch FATE#321126 yfjiang@suse.com -- Only launch the keyboard and IM setup Patch1: gnome-initial-setup-only-setup-keyboard.patch -# PATCH-FEATURE-SLE gnome-initial-setup-disable-dep-on-started-docs.patch FATE#321126 yfjiang@suse.com -- Disable help dialog after g-i-s system to break the dependency of gnome-getting-started-docs +# PATCH-FEATURE-SLE gnome-initial-setup-disable-dep-on-started-docs.patch FATE#321126 yfjiang@suse.com -- Disable help dialog after g-i-s system to remove the dependency of gnome-getting-started-docs Patch2: gnome-initial-setup-disable-dep-on-started-docs.patch # PATCH-FIX-OPENSUSE gnome-initial-setup-mozc-engine-prioritized.patch boo#1067288 bnc#1029083 qzhao@suse.com -- Make the Mozc input engine as the 1st choice for Japanese environment. Patch3: gnome-initial-setup-mozc-engine-prioritized.patch @@ -63,7 +63,8 @@ BuildRequires: pkgconfig(rest-0.7) BuildRequires: pkgconfig(webkit2gtk-4.0) Recommends: %{name}-lang -%if 0%{?is_opensuse} +# Remove the yelp document dependency on both sle and leap, keeping tw consistent with upstream +%if !0%{?sle_version} Requires: gnome-getting-started-docs %endif @@ -74,7 +75,8 @@ %prep %setup -q -%if !0%{?is_opensuse} +# Only enable keyboard/im setup feature in CJK environment on both sle and leap, keeping tw consistent with upstream +%if 0%{?sle_version} >= 120300 %patch0 -p1 %patch1 -p1 %patch2 -p1 ++++++ gnome-initial-setup-disable-dep-on-started-docs.patch ++++++ --- /var/tmp/diff_new_pack.GNolD3/_old 2018-03-28 10:34:07.143137940 +0200 +++ /var/tmp/diff_new_pack.GNolD3/_new 2018-03-28 10:34:07.147137796 +0200 @@ -1,7 +1,8 @@ -diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup-copy-worker.c ---- gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c 2017-06-14 21:39:03.000000000 +0800 -+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup-copy-worker.c 2017-09-15 11:54:16.374245929 +0800 -@@ -89,7 +89,6 @@ +Index: gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c +=================================================================== +--- gnome-initial-setup-3.26.0.orig/gnome-initial-setup/gnome-initial-setup-copy-worker.c ++++ gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c +@@ -89,7 +89,6 @@ main (int argc, move_file_from_homedir (src, dest, path); FILE (".config/gnome-initial-setup-done"); @@ -9,3 +10,21 @@ FILE (".config/dconf/user"); FILE (".config/goa-1.0/accounts.conf"); FILE (".config/monitors.xml"); +Index: gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c +=================================================================== +--- gnome-initial-setup-3.26.0.orig/gnome-initial-setup/gnome-initial-setup.c ++++ gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c +@@ -285,13 +285,6 @@ gis_ensure_stamp_files (void) + gchar *file; + GError *error = NULL; + +- file = g_build_filename (g_get_user_config_dir (), "run-welcome-tour", NULL); +- if (!g_file_set_contents (file, "yes", -1, &error)) { +- g_warning ("Unable to create %s: %s", file, error->message); +- g_clear_error (&error); +- } +- g_free (file); +- + file = g_build_filename (g_get_user_config_dir (), "gnome-initial-setup-done", NULL); + if (!g_file_set_contents (file, "yes", -1, &error)) { + g_warning ("Unable to create %s: %s", file, error->message);