From 384fb67a12ea207d75da9e5750906005cba93738 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 17 Feb 2021 23:41:31 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-initial-setup.git#f33267f6c56eecded7c19b4c9620379f71813f56
---
 .gitignore               |  1 +
 gnome-initial-setup.spec | 22 +++++++++++-----------
 sources                  |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 192fe2e..8bea431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@
 /gnome-initial-setup-3.38.1.tar.xz
 /gnome-initial-setup-3.38.2.tar.xz
 /gnome-initial-setup-3.38.3.tar.xz
+/gnome-initial-setup-40.beta.tar.xz
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 36c261d..814f83a 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -4,14 +4,16 @@
 %global gtk_required_version 3.11.3
 %global geoclue_version 2.3.1
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           gnome-initial-setup
-Version:        3.38.3
-Release:        2%{?dist}
+Version:        40~beta
+Release:        1%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
-Source0:        https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
 Source1:        vendor.conf
 
 BuildRequires:  meson
@@ -66,7 +68,7 @@ a good setup experience to welcome you to your system, and walks
 you through configuring it. It is integrated with gdm.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson -Dparental_controls=disabled -Dvendor-conf-file=%{_datadir}/gnome-initial-setup/vendor.conf
@@ -75,11 +77,8 @@ you through configuring it. It is integrated with gdm.
 %install
 %meson_install
 
-# Desktop file does not (and probably will not) ever validate, as it uses
-# an absolute path /tmp/-style trigger to determine whether to autostart.
-# desktop-file-validate %%{buildroot}/%%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 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}/applications/gnome-initial-setup.desktop
 
 mkdir -p %{buildroot}%{_datadir}/gnome-initial-setup
 cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
@@ -94,12 +93,10 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %doc README.md
 %{_libexecdir}/gnome-initial-setup
 %{_libexecdir}/gnome-initial-setup-copy-worker
-%{_libexecdir}/gnome-welcome-tour
-%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
 %{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
 
-%{_datadir}/gdm/greeter/applications/gnome-initial-setup.desktop
+%{_datadir}/applications/gnome-initial-setup.desktop
 %{_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
@@ -109,6 +106,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 27da681..3575e84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-initial-setup-3.38.3.tar.xz) = e30a6d94216b8dc8893b591d8128f4a2e96fa1687c6e21207aaf3e790b7b8df8bd15ac4c1f9648444d9614a923ee72cd9366277064abc157c51a7d075d132f8d
+SHA512 (gnome-initial-setup-40.beta.tar.xz) = 79e8fd74f3506347665c381f7e88344ed0b16bb1bd2db5593b51f01e7f5808b441c5929020fc3b690bc4f1b7729e8de421886209ea1c27347b765c820a0b81bc