From 3adf80695bc6ea997e89f437f99afc329b5f3c91 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 17 Feb 2021 21:46:47 +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-tour.git#a1e9bc48b6091c249e237b9091ebd4c18b20f807
---
 .gitignore      |  2 ++
 gnome-tour.spec | 30 ++++++++++++++++++------------
 sources         |  4 ++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d14b01..7b2a1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /gnome-tour-3.37.91.tar.xz
 /gnome-tour-3.37.92.tar.xz
 /gnome-tour-3.38.0.tar.xz
+/gnome-tour-40.beta.tar.xz
+/welcome-fedora.svg
diff --git a/gnome-tour.spec b/gnome-tour.spec
index c21273b..a2566c2 100644
--- a/gnome-tour.spec
+++ b/gnome-tour.spec
@@ -4,21 +4,23 @@
 # required rust libraries
 %global bundled_rust_deps 1
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           gnome-tour
-Version:        3.38.0
-Release:        3%{?dist}
+Version:        40~beta
+Release:        2%{?dist}
 Summary:        GNOME Tour and Greeter
 
 # * gnome-tour source code is GPLv3+
-# * fedora-initial-intro.webm is CC-BY-SA
+# * welcome-fedora.svg is CC-BY-SA
 # * bundled rust crates all include either MIT or GPLv3+ as one of the possible
 #   licenses, which when compiled into gnome-tour binary together with GPLv3+
 #   gnome-tour source code results in effective GPLv3+ for the resulting binary
 License:        GPLv3+ and CC-BY-SA
 URL:            https://gitlab.gnome.org/GNOME/gnome-tour
-Source0:        https://download.gnome.org/sources/gnome-tour/3.38/gnome-tour-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-tour/40/gnome-tour-%{tarball_version}.tar.xz
 # https://pagure.io/fedora-workstation/issue/175
-Source1:        fedora-initial-intro.webm
+Source1:        welcome-fedora.svg
 
 BuildRequires:  meson
 BuildRequires:  pkgconfig(glib-2.0)
@@ -144,7 +146,10 @@ A guided tour and greeter for GNOME.
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
+
+# Install Fedora branding
+cp -a %{SOURCE1} data/resources/assets/welcome.svg
 
 %if ! 0%{?bundled_rust_deps}
 sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
@@ -159,7 +164,7 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
 
 
 %build
-%meson -Dvideo_path=%{_datadir}/gnome-tour/fedora-initial-intro.webm
+%meson
 %meson_build
 
 %if ! 0%{?bundled_rust_deps}
@@ -174,9 +179,6 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
 %cargo_install
 %endif
 
-# Install Fedora video
-install -p -m 0644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome-tour/fedora-initial-intro.webm
-
 %find_lang gnome-tour
 
 
@@ -190,14 +192,18 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des
 %doc NEWS README.md
 %{_bindir}/gnome-tour
 %{_datadir}/applications/org.gnome.Tour.desktop
-%dir %{_datadir}/gnome-tour
-%{_datadir}/gnome-tour/fedora-initial-intro.webm
 %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Tour.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Tour-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Tour.metainfo.xml
 
 
 %changelog
+* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
+- New welcome image for Fedora branding (thanks, jimmac!)
+
+* 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.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index e835d8c..010610c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fedora-initial-intro.webm) = bd066772bb57b352e230f23644c7ce57ba2e0c18b336c0e7495fbf208d7be93bed38db9c0fb5358bb85abacd648ac71ecba98175cb4454f715933db9288c92e1
-SHA512 (gnome-tour-3.38.0.tar.xz) = 496298c19b2f9585afcc20b66b943c03eeb03f802e94219ea1405126a36c18d0a7576eb49017ca8f26f5aef8bfe18fc56649cfff8a02a859ac253e5735f6bb97
+SHA512 (gnome-tour-40.beta.tar.xz) = aecb41a3f101371e69e84f2acf5ca5d4877ec2ce55dc0a772e5d09c664264ee7858c2a0803386d544e5263c5b26f7898dc955ebd087a2d594b3bc3cdee35cb73
+SHA512 (welcome-fedora.svg) = a8c265ea8869f04daffba8ff3984c7b2fc8c201e2078f875ceb55510b5998ab97e6cf3bc908e156a2d7dd2a3496eea913e759f1861af61a29a2a8b54faba47f2