From 87f9aeeb4e623c25aa9f092c969f2aefc0a9275c Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 14 Feb 2022 14:14:01 +0000
Subject: [PATCH] Update to 42.beta

---
 .gitignore      |   1 +
 gnome-tour.spec | 184 +++++++++++++++++++++++-------------------------
 sources         |   3 +-
 3 files changed, 90 insertions(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
index 942fec1..854334e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /welcome-fedora.svg
 /gnome-tour-40.0.tar.xz
 /gnome-tour-41.rc.tar.xz
+/gnome-tour-42.beta.tar.xz
diff --git a/gnome-tour.spec b/gnome-tour.spec
index 1e49817..a23cbd7 100644
--- a/gnome-tour.spec
+++ b/gnome-tour.spec
@@ -7,8 +7,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-tour
-Version:        41~rc
-Release:        2%{?dist}
+Version:        42~beta
+Release:        1%{?dist}
 Summary:        GNOME Tour and Greeter
 
 # * gnome-tour source code is GPLv3+
@@ -26,11 +26,8 @@ BuildRequires:  meson
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(gstreamer-1.0)
-BuildRequires:  pkgconfig(gstreamer-video-1.0)
-BuildRequires:  pkgconfig(gstreamer-player-1.0)
-BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  /usr/bin/desktop-file-validate
 
@@ -42,105 +39,96 @@ BuildRequires:  rust-packaging
 %endif
 
 %if 0%{?bundled_rust_deps}
-# bundled crates list updated for gnome-tour 3.37.91
-Provides: bundled(crate(aho-corasick/default)) = 0.7.13
-Provides: bundled(crate(anyhow/default)) = 1.0.32
-Provides: bundled(crate(atk/default)) = 0.9.0
-Provides: bundled(crate(atk-sys/default)) = 0.10.0
+# bundled crates list updated for gnome-tour 42.beta
+Provides: bundled(crate(aho-corasick/default)) = 0.7.18
+Provides: bundled(crate(anyhow/default)) = 1.0.53
 Provides: bundled(crate(atty/default)) = 0.2.14
-Provides: bundled(crate(autocfg/default)) = 1.0.0
-Provides: bundled(crate(bitflags/default)) = 1.2.1
-Provides: bundled(crate(cairo-rs/default)) = 0.9.1
-Provides: bundled(crate(cairo-sys-rs/default)) = 0.10.0
-Provides: bundled(crate(cc/default)) = 1.0.58
-Provides: bundled(crate(cfg-if/default)) = 0.1.10
-Provides: bundled(crate(either/default)) = 1.6.0
+Provides: bundled(crate(autocfg/default)) = 1.0.1
+Provides: bundled(crate(bitflags/default)) = 1.3.2
+Provides: bundled(crate(block/default)) = 0.1.6
+Provides: bundled(crate(cairo-rs/default)) = 0.15.1
+Provides: bundled(crate(cairo-sys-rs/default)) = 0.15.1
+Provides: bundled(crate(cc/default)) = 1.0.72
+Provides: bundled(crate(cfg-expr/default)) = 0.9.0
+Provides: bundled(crate(cfg-if/default)) = 1.0.0
 Provides: bundled(crate(env_logger/default)) = 0.7.1
-Provides: bundled(crate(futures/default)) = 0.3.5
-Provides: bundled(crate(futures-channel/default)) = 0.3.5
-Provides: bundled(crate(futures-core/default)) = 0.3.5
-Provides: bundled(crate(futures-executor/default)) = 0.3.5
-Provides: bundled(crate(futures-io/default)) = 0.3.5
-Provides: bundled(crate(futures-macro/default)) = 0.3.5
-Provides: bundled(crate(futures-sink/default)) = 0.3.5
-Provides: bundled(crate(futures-task/default)) = 0.3.5
-Provides: bundled(crate(futures-util/default)) = 0.3.5
-Provides: bundled(crate(gdk/default)) = 0.13.1
-Provides: bundled(crate(gdk-pixbuf/default)) = 0.9.0
-Provides: bundled(crate(gdk-pixbuf-sys/default)) = 0.10.0
-Provides: bundled(crate(gdk-sys/default)) = 0.10.0
-Provides: bundled(crate(gettext-rs/default)) = 0.4.4
-Provides: bundled(crate(gettext-sys/default)) = 0.19.9
-Provides: bundled(crate(gio/default)) = 0.9.0
-Provides: bundled(crate(gio-sys/default)) = 0.10.0
-Provides: bundled(crate(glib/default)) = 0.10.1
-Provides: bundled(crate(glib-macros/default)) = 0.10.1
-Provides: bundled(crate(glib-sys/default)) = 0.10.0
-Provides: bundled(crate(gobject-sys/default)) = 0.10.0
-Provides: bundled(crate(gstreamer/default)) = 0.16.2
-Provides: bundled(crate(gstreamer-base/default)) = 0.16.0
-Provides: bundled(crate(gstreamer-base-sys/default)) = 0.9.0
-Provides: bundled(crate(gstreamer-player/default)) = 0.16.0
-Provides: bundled(crate(gstreamer-player-sys/default)) = 0.9.0
-Provides: bundled(crate(gstreamer-sys/default)) = 0.9.0
-Provides: bundled(crate(gstreamer-video/default)) = 0.16.0
-Provides: bundled(crate(gstreamer-video-sys/default)) = 0.9.0
-Provides: bundled(crate(gtk/default)) = 0.9.1
-Provides: bundled(crate(gtk-sys/default)) = 0.10.0
-Provides: bundled(crate(heck/default)) = 0.3.1
+Provides: bundled(crate(field-offset/default)) = 0.3.4
+Provides: bundled(crate(futures-channel/default)) = 0.3.19
+Provides: bundled(crate(futures-core/default)) = 0.3.19
+Provides: bundled(crate(futures-executor/default)) = 0.3.19
+Provides: bundled(crate(futures-io/default)) = 0.3.19
+Provides: bundled(crate(futures-task/default)) = 0.3.19
+Provides: bundled(crate(futures-util/default)) = 0.3.19
+Provides: bundled(crate(gdk4/default)) = 0.4.4
+Provides: bundled(crate(gdk-pixbuf/default)) = 0.15.1
+Provides: bundled(crate(gdk-pixbuf-sys/default)) = 0.15.1
+Provides: bundled(crate(gdk4-sys/default)) = 0.4.2
+Provides: bundled(crate(gettext-rs/default)) = 0.7.0
+Provides: bundled(crate(gettext-sys/default)) = 0.21.2
+Provides: bundled(crate(gio/default)) = 0.15.3
+Provides: bundled(crate(gio-sys/default)) = 0.15.1
+Provides: bundled(crate(glib/default)) = 0.15.3
+Provides: bundled(crate(glib-macros/default)) = 0.15.3
+Provides: bundled(crate(glib-sys/default)) = 0.15.1
+Provides: bundled(crate(gobject-sys/default)) = 0.15.1
+Provides: bundled(crate(graphene-rs/default)) = 0.15.1
+Provides: bundled(crate(graphene-sys/default)) = 0.15.1
+Provides: bundled(crate(gsk4/default)) = 0.4.4
+Provides: bundled(crate(gsk4-sys/default)) = 0.4.2
+Provides: bundled(crate(gtk4/default)) = 0.4.5
+Provides: bundled(crate(gtk4-macros/default)) = 0.4.3
+Provides: bundled(crate(gtk4-sys/default)) = 0.4.5
+Provides: bundled(crate(heck/default)) = 0.3.3
+Provides: bundled(crate(heck/default)) = 0.4.0
 Provides: bundled(crate(humantime/default)) = 1.3.0
-Provides: bundled(crate(itertools/default)) = 0.9.0
 Provides: bundled(crate(lazy_static/default)) = 1.4.0
 Provides: bundled(crate(libc/default)) = 0.2.74
-Provides: bundled(crate(libhandy/default)) = 1.0.0~alpha
-Provides: bundled(crate(libhandy-sys/default)) = 1.0.0~alpha
-Provides: bundled(crate(locale_config/default)) = 0.2.3
-Provides: bundled(crate(log/default)) = 0.4.11
-Provides: bundled(crate(memchr/default)) = 2.3.3
-Provides: bundled(crate(muldiv/default)) = 0.2.1
-Provides: bundled(crate(num-integer/default)) = 0.1.43
-Provides: bundled(crate(num-rational/default)) = 0.3.0
-Provides: bundled(crate(num-traits/default)) = 0.2.12
-Provides: bundled(crate(once_cell/default)) = 1.4.1
-Provides: bundled(crate(pango/default)) = 0.9.1
-Provides: bundled(crate(pango-sys/default)) = 0.10.0
-Provides: bundled(crate(paste/default)) = 0.1.18
-Provides: bundled(crate(paste-impl/default)) = 0.1.18
-Provides: bundled(crate(pin-project/default)) = 0.4.23
-Provides: bundled(crate(pin-project-internal/default)) = 0.4.23
+Provides: bundled(crate(libadwaita/default)) = 0.1.0
+Provides: bundled(crate(libadwaita-sys/default)) = 0.1.0
+Provides: bundled(crate(libc/default)) = 0.2.114
+Provides: bundled(crate(locale_config/default)) = 0.3.0
+Provides: bundled(crate(log/default)) = 0.4.14
+Provides: bundled(crate(malloc_buf/default)) = 0.0.6
+Provides: bundled(crate(memchr/default)) = 2.4.1
+Provides: bundled(crate(memoffset/default)) = 0.6.5
+Provides: bundled(crate(objc/default)) = 0.2.7
+Provides: bundled(crate(objc-foundation/default)) = 0.1.1
+Provides: bundled(crate(objc_id/default)) = 0.1.1
+Provides: bundled(crate(pango/default)) = 0.15.2
+Provides: bundled(crate(pango-sys/default)) = 0.15.1
+Provides: bundled(crate(pest/default)) = 2.1.3
+Provides: bundled(crate(pin-project-lite/default)) = 0.2.8
 Provides: bundled(crate(pin-utils/default)) = 0.1.0
-Provides: bundled(crate(pkg-config/default)) = 0.3.18
+Provides: bundled(crate(pkg-config/default)) = 0.3.24
 Provides: bundled(crate(pretty_env_logger/default)) = 0.4.0
-Provides: bundled(crate(pretty-hex/default)) = 0.1.1
-Provides: bundled(crate(proc-macro2/default)) = 1.0.19
-Provides: bundled(crate(proc-macro-crate/default)) = 0.1.5
+Provides: bundled(crate(proc-macro-crate/default)) = 1.1.0
 Provides: bundled(crate(proc-macro-error/default)) = 1.0.4
 Provides: bundled(crate(proc-macro-error-attr/default)) = 1.0.4
-Provides: bundled(crate(proc-macro-hack/default)) = 0.5.18
-Provides: bundled(crate(proc-macro-nested/default)) = 0.1.6
+Provides: bundled(crate(proc-macro2/default)) = 1.0.36
 Provides: bundled(crate(quick-error/default)) = 1.2.3
-Provides: bundled(crate(quote/default)) = 1.0.7
-Provides: bundled(crate(regex/default)) = 1.3.9
-Provides: bundled(crate(regex-syntax/default)) = 0.6.18
-Provides: bundled(crate(serde/default)) = 1.0.115
-Provides: bundled(crate(slab/default)) = 0.4.2
-Provides: bundled(crate(strum/default)) = 0.18.0
-Provides: bundled(crate(strum_macros/default)) = 0.18.0
-Provides: bundled(crate(syn/default)) = 1.0.38
-Provides: bundled(crate(system-deps/default)) = 1.3.2
-Provides: bundled(crate(termcolor/default)) = 1.1.0
-Provides: bundled(crate(thiserror/default)) = 1.0.20
-Provides: bundled(crate(thiserror-impl/default)) = 1.0.20
-Provides: bundled(crate(thread_local/default)) = 1.0.1
-Provides: bundled(crate(toml/default)) = 0.5.6
-Provides: bundled(crate(unicode-segmentation/default)) = 1.6.0
-Provides: bundled(crate(unicode-xid/default)) = 0.2.1
-Provides: bundled(crate(version_check/default)) = 0.9.2
-Provides: bundled(crate(version-compare/default)) = 0.0.10
+Provides: bundled(crate(quote/default)) = 1.0.15
+Provides: bundled(crate(regex/default)) = 1.5.4
+Provides: bundled(crate(regex-syntax/default)) = 0.6.25
+Provides: bundled(crate(rustc_version/default)) = 0.3.3
+Provides: bundled(crate(semver/default)) = 0.11.0
+Provides: bundled(crate(semver-parser/default)) = 0.10.2
+Provides: bundled(crate(serde/default)) = 1.0.136
+Provides: bundled(crate(slab/default)) = 0.4.5
+Provides: bundled(crate(smallvec/default)) = 1.8.0
+Provides: bundled(crate(syn/default)) = 1.0.86
+Provides: bundled(crate(system-deps/default)) = 6.0.0
+Provides: bundled(crate(temp-dir/default)) = 0.1.11
+Provides: bundled(crate(termcolor/default)) = 1.1.2
+Provides: bundled(crate(thiserror/default)) = 1.0.30
+Provides: bundled(crate(thiserror-impl/default)) = 1.0.30
+Provides: bundled(crate(toml/default)) = 0.5.8
+Provides: bundled(crate(ucd-trie/default)) = 0.1.3
+Provides: bundled(crate(unicode-segmentation/default)) = 1.8.0
+Provides: bundled(crate(unicode-xid/default)) = 0.2.2
+Provides: bundled(crate(version-compare/default)) = 0.1.0
+Provides: bundled(crate(version_check/default)) = 0.9.4
 %endif
 
-Requires: gstreamer1-plugins-good-gtk%{?_isa}
-
 # Removed in F34
 Obsoletes: gnome-getting-started-docs < 3.38.1-2
 Obsoletes: gnome-getting-started-docs-cs < 3.38.1-2
@@ -196,7 +184,7 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
 
 
 %check
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Tour.metainfo.xml
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.gnome.Tour.metainfo.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.desktop
 
 
@@ -204,13 +192,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des
 %license LICENSE.md
 %doc NEWS README.md
 %{_bindir}/gnome-tour
+%{_datadir}/gnome-tour/
 %{_datadir}/applications/org.gnome.Tour.desktop
 %{_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
+%{_metainfodir}/org.gnome.Tour.metainfo.xml
 
 
 %changelog
+* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 42~beta-1
+- Update to 42.beta
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 41~rc-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index fdfe464..e86aa16 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (gnome-tour-41.rc.tar.xz) = 400d47e612e741978c09d71ee25353088fbe18569cd1dc6cc62f146e895e28aca1678bfa1f327f40608294d2391cc3b3453e2ae7216cb2501977d81ca3fcd2fa
-SHA512 (welcome-fedora.svg) = 9ea6ec1693666b84ae2ef47c122b9178963f5ed89c14eafe279697b9ae2cd0091e382bc4fdc29e31f7f8eb80a51aac8a281f8482d6e5f0aefbc7d0a2c2bde828
+SHA512 (gnome-tour-42.beta.tar.xz) = db05b222b74001b0d09f50b56ebe6bfd89173518b777802b018f4d50ccb25e0a8198427a9a8371a7e477043352d39e51ed906f54d76f020f01a2569b68aa5344