From f8a5cf68de952e37f83645aba2328d13df351b95 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 18 Feb 2021 20:09:03 +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-font-viewer.git#22e6b9b6c5777e8c1389a36a7798d78f0e3cc7eb
---
 .gitignore             |  1 +
 gnome-font-viewer.spec | 27 ++++++++++++++++-----------
 sources                |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06087af..082195d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /gnome-font-viewer-3.33.4.tar.xz
 /gnome-font-viewer-3.33.90.tar.xz
 /gnome-font-viewer-3.34.0.tar.xz
+/gnome-font-viewer-40.beta.tar.xz
diff --git a/gnome-font-viewer.spec b/gnome-font-viewer.spec
index 91d5342..f13ba16 100644
--- a/gnome-font-viewer.spec
+++ b/gnome-font-viewer.spec
@@ -1,23 +1,24 @@
-%global         release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+%global tarball_version %%(echo %{version} | tr '~' '.')
+%global major_version %%(echo %%{tarball_version} | awk -F. '{print $1}')
 
 Name:           gnome-font-viewer
-Version:        3.34.0
-Release:        6%{?dist}
+Version:        40~beta
+Release:        1%{?dist}
 Summary:        Utility for previewing fonts for GNOME
 
 License:        GPLv2+
-#No URL for the package specifically, as of now
-URL:            http://www.gnome.org/gnome-3/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-font-viewer/%{release_version}/%{name}-%{version}.tar.xz
+URL:            https://gitlab.gnome.org/GNOME/gnome-font-viewer
+Source0:        https://download.gnome.org/sources/gnome-font-viewer/%{major_version}/%{name}-%{tarball_version}.tar.xz
 
-BuildRequires:  meson >= 0.40.1
 BuildRequires:  gcc
-BuildRequires:  pkgconfig(glib-2.0) >= 2.35.1
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20.0
-BuildRequires:  pkgconfig(harfbuzz) >= 0.9.9
+BuildRequires:  meson
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  gettext
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  /usr/bin/desktop-file-validate
@@ -28,7 +29,7 @@ information about a specified font. You can use the Font Viewer to display the
 name, style, type, size, version and copyright of the font.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson
@@ -56,6 +57,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome
 %{_datadir}/thumbnailers/%{name}.thumbnailer
 
 %changelog
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+- Update upstream URLs
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 63c58ca..9e7b036 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-font-viewer-3.34.0.tar.xz) = 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
+SHA512 (gnome-font-viewer-40.beta.tar.xz) = 0de279ce30689aa16855b75997aa065a54c0633f4bba49a4d3e242a2d023aae4284259fbd26be2462d45c20ed990ece2c78e66a99cb26830623160989d5053f3