Upgrade to 3.38.5

Update Version, Release, Source0, BuildRequires, Requires, stage 'build', 'install', 'files'
Use meson rebuild, delete setup-shell.desktop, which doesn't existed in this version
Delete honor-firstboot-disabled.patch which existed in this version

0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch

@@ -10,18 +10,21 @@ Change-Id: Ie4246622b4555b153449e42d9590be4675bebd79
  1 file changed, 1 deletion(-)
 
 diff --git a/gnome-initial-setup/pages/timezone/backward b/gnome-initial-setup/pages/timezone/backward
-index f1f95a8..9bf41f3 100644
+index 8594be6..3fe71fc 100644
 --- a/gnome-initial-setup/pages/timezone/backward
 +++ b/gnome-initial-setup/pages/timezone/backward
-@@ -29,7 +29,6 @@ Link	Asia/Chongqing		Asia/Chungking
+@@ -35,7 +35,6 @@ Link	Asia/Dhaka		Asia/Dacca
- Link	Asia/Dhaka		Asia/Dacca
+ Link	Asia/Shanghai		Asia/Harbin
+ Link	Asia/Urumqi		Asia/Kashgar
  Link	Asia/Kathmandu		Asia/Katmandu
- Link	Asia/Kolkata		Asia/Calcutta
 -Link	Asia/Macau		Asia/Macao
- Link	Asia/Jerusalem		Asia/Tel_Aviv
+ Link	Asia/Yangon		Asia/Rangoon
  Link	Asia/Ho_Chi_Minh	Asia/Saigon
- Link	Asia/Thimphu		Asia/Thimbu
+ Link	Asia/Jerusalem		Asia/Tel_Aviv
--- 
+@@ -125,4 +124,4 @@ Link	Pacific/Pago_Pago	US/Samoa
-2.19.1
+ Link	Etc/UTC			UTC
-
+ Link	Etc/UTC			Universal
-
+ Link	Europe/Moscow		W-SU
+-Link	Etc/UTC			Zulu
+\ No newline at end of file
++Link	Etc/UTC			Zulu

gnome-initial-setup.spec

@@ -1,29 +1,28 @@
 Name:           gnome-initial-setup
-Version:        3.30.0
+Version:        3.38.5
-Release:        3
+Release:        1
 Summary:        A easy way to prepare a new system
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
-Source0:        https://download.gnome.org/sources/gnome-initial-setup/3.30/gnome-initial-setup-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-initial-setup/3.38/gnome-initial-setup-%{version}.tar.xz
 Source1:        vendor.conf
-Patch0000:      honor-firstboot-disabled.patch
 Patch9000:      0001-gnome-initial-setup-remove-link-Macau-to-Macao.patch
 
-BuildRequires:  krb5-devel desktop-file-utils intltool libpwquality-devel
+BuildRequires:  krb5-devel desktop-file-utils libpwquality-devel
 BuildRequires:  pkgconfig(libnm) >= 1.2 pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(libnma) >= 1.0 pkgconfig(cheese)
 BuildRequires:  pkgconfig(accountsservice) pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gnome-desktop-3.0) pkgconfig(gweather-3.0)
 BuildRequires:  pkgconfig(cheese-gtk) >= 3.3.5 pkgconfig(goa-1.0)
 BuildRequires:  pkgconfig(geocode-glib-1.0) pkgconfig(goa-backend-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.11.3 pkgconfig(glib-2.0) >= 2.53.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.11.3 pkgconfig(glib-2.0) >= 2.63.1
-BuildRequires:  pkgconfig(gio-2.0) >= 2.53.0 pkgconfig(gio-unix-2.0) >= 2.53.0
+BuildRequires:  pkgconfig(gio-2.0) >= 2.63.1 pkgconfig(gio-unix-2.0) >= 2.63.1
-BuildRequires:  pkgconfig(gdm) pkgconfig(iso-codes) krb5-devel
+BuildRequires:  pkgconfig(gdm) pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(libgeoclue-2.0) >= 2.3.1 pkgconfig(packagekit-glib2)
 BuildRequires:  pkgconfig(webkit2gtk-4.0) ibus-devel rest-devel polkit-devel
-BuildRequires:  libsecret-devel autoconf gnome-common
+BuildRequires:  libsecret-devel gnome-common meson gcc
 
-Requires:       gdm geoclue2-libs >= 2.3.1 glib2 >= 2.53.0 polkit-js-engine libgnomekbd
+Requires:       gdm geoclue2-libs >= 2.3.1 glib2 >= 2.63.1 polkit-js-engine libgnomekbd
 Requires(pre):  shadow-utils
 
 Provides:       user(%name)
@@ -37,17 +36,15 @@ prepare a new system.
 %autosetup -p1
 
 %build
-autoreconf -i
+%meson -Dparental_controls=disabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
-%configure --enable-software-sources --with-vendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
+%meson_build
-%make_build
 
 %install
-%make_install
+%meson_install
 %delete_la
 
 desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
-desktop-file-validate %{buildroot}%{_datadir}/gdm/greeter/applications/setup-shell.desktop
 
 install -d %{buildroot}%{_datadir}/gnome-initial-setup
 cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
@@ -58,7 +55,7 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
 useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
 
 %files -f gnome-initial-setup.lang
-%doc README COPYING
+%doc README.md COPYING
 %{_libexecdir}/gnome-initial-setup*
 %{_libexecdir}/gnome-welcome-tour
 %{_sysconfdir}/xdg/autostart/*.desktop
@@ -66,11 +63,18 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-session/sessions/gnome-initial-setup.session
 %{_datadir}/gnome-shell/modes/initial-setup.json
 %{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
+%{_userunitdir}/*
 
 %dir %{_datadir}/gnome-initial-setup
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Mon Jun 7 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.5-1
+- Upgrade to 3.38.5
+- Update Version, Release, Source0, BuildRequires, Requires, stage 'build', 'install', 'files'
+- Use meson rebuild, delete setup-shell.desktop, which doesn't existed in this version
+- Delete honor-firstboot-disabled.patch which existed in this version
+
 * Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.30.0-3
 - Type:bugfix
 - ID:NA

honor-firstboot-disabled.patch

@@ -1,88 +0,0 @@
-From cfa7925f70ec44a976f6d0426133e3b8ba589142 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 23 Jan 2017 19:42:44 +0100
-Subject: [PATCH] Exit gracefully if we are disabled systemwide
-
-Sysadmins might want to disable any kind of initial setup for their
-users, perhaps because they pre-configure their environments. We
-should provide an easy way to do it.
-
-At least the anaconda installer provides an option to skip any kind
-post-install setup tools so, for now we're only adding support for
-that but more might be added in the future.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777707
----
- gnome-initial-setup/Makefile.am           |  3 +-
- gnome-initial-setup/gnome-initial-setup.c | 34 +++++++++++++++++++++++
- 2 files changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
-index 6b6d5fb..e6a3e10 100644
---- a/gnome-initial-setup/Makefile.am
-+++ b/gnome-initial-setup/Makefile.am
-@@ -12,7 +12,8 @@ AM_CPPFLAGS = \
- 	-DUIDIR="\"$(uidir)\"" \
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- 	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
--	-DDATADIR=\""$(datadir)"\"
-+	-DDATADIR=\""$(datadir)"\" \
-+	-DSYSCONFDIR=\""$(sysconfdir)"\"
- 
- libexec_PROGRAMS = gnome-initial-setup gnome-initial-setup-copy-worker
- 
-diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
-index 414ea94..989827b 100644
---- a/gnome-initial-setup/gnome-initial-setup.c
-+++ b/gnome-initial-setup/gnome-initial-setup.c
-@@ -247,6 +247,31 @@ get_mode (void)
-     return GIS_DRIVER_MODE_NEW_USER;
- }
- 
-+static gboolean
-+initial_setup_disabled_by_anaconda (void)
-+{
-+  GKeyFile *key_file;
-+  const gchar *file_name = SYSCONFDIR "/sysconfig/anaconda";
-+  gboolean disabled = FALSE;
-+  GError *error = NULL;
-+
-+  key_file = g_key_file_new ();
-+  if (!g_key_file_load_from_file (key_file, file_name, G_KEY_FILE_NONE, &error)) {
-+    if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT) &&
-+        !g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND)) {
-+      g_warning ("Could not read %s: %s", file_name, error->message);
-+    }
-+    g_error_free (error);
-+    goto out;
-+  }
-+
-+  disabled = g_key_file_get_boolean (key_file, "General",
-+                                     "post_install_tools_disabled", NULL);
-+ out:
-+  g_key_file_unref (key_file);
-+  return disabled;
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -281,6 +306,15 @@ main (int argc, char *argv[])
-   skipped_pages = g_ptr_array_new_with_free_func ((GDestroyNotify) gtk_widget_destroy);
-   mode = get_mode ();
- 
-+  /* We only do this in existing-user mode, because if gdm launches us
-+   * in new-user mode and we just exit, gdm's special g-i-s session
-+   * never terminates. */
-+  if (initial_setup_disabled_by_anaconda () &&
-+      mode == GIS_DRIVER_MODE_EXISTING_USER) {
-+    gis_ensure_stamp_files ();
-+    exit (EXIT_SUCCESS);
-+  }
-+
-   /* When we are running as the gnome-initial-setup user we
-    * dont have a normal user session and need to initialize
-    * the keyring manually so that we can pass the credentials
--- 
-2.19.0.rc0
-