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-calculator.git#3a5bdaf1951a5b39527eb1c9c0b336d680fb42a3

.gitignore

@@ -89,3 +89,4 @@
 /gnome-calculator-3.38.0.tar.xz
 /gnome-calculator-3.38.1.tar.xz
 /gnome-calculator-3.38.2.tar.xz
+/gnome-calculator-40.beta.tar.xz

0001-appdata-Fix-release-tag-for-40.beta.patch

@@ -0,0 +1,28 @@
+From 13a72ad5f993f1d5c0c5bb42f56e808e357ab440 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Thu, 18 Feb 2021 16:55:02 +0100
+Subject: [PATCH] appdata: Fix release tag for 40.beta
+
+---
+ data/org.gnome.Calculator.appdata.xml.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/org.gnome.Calculator.appdata.xml.in b/data/org.gnome.Calculator.appdata.xml.in
+index 8c4dfd94..8ee0c264 100644
+--- a/data/org.gnome.Calculator.appdata.xml.in
++++ b/data/org.gnome.Calculator.appdata.xml.in
+@@ -64,9 +64,9 @@
+   <translation type="gettext">gnome-calculator</translation>
+   <content_rating type="oars-1.1" />
+   <releases>
+-    <release version="40.alpha" date="2021-01-10" type="development">
++    <release version="40.beta" date="2021-02-05" type="development">
+       <description>
+-        <p>Overview of changes in gnome-calculator 40.alpha</p>
++        <p>Overview of changes in gnome-calculator 40.beta</p>
+         <ul>
+           <li>Updated Translations</li>
+           <li>Fixed CI build (Robert Roth)</li>
+-- 
+2.29.2
+

gnome-calculator.spec

@@ -1,11 +1,15 @@
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           gnome-calculator
-Version:        3.38.2
-Release:        2%{?dist}
+Version:        40~beta
+Release:        1%{?dist}
 Summary:        A desktop calculator
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Calculator
-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
+
+Patch0:         0001-appdata-Fix-release-tag-for-40.beta.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -19,14 +23,11 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtksourceview-4)
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  vala
 BuildRequires:  /usr/bin/appstream-util
 
-Provides:  gcalctool = 6.6.2-3
-Obsoletes: gcalctool < 6.6.2-3
-
-
 %description
 gnome-calculator is a powerful graphical calculator with financial,
 logical and scientific modes. It uses a multiple precision package
@@ -43,7 +44,7 @@ developing applications that use %{name}.
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 
 %build
@@ -101,6 +102,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator
 
 
 %changelog
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+- Drop old gcalctool obsoletes
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (gnome-calculator-3.38.2.tar.xz) = 41e58b34640e795108a552aa0d95b03f0c84c4d5af6eef7fe8350c5f4e031a0fad7cad73034b38b2121f09687815b6b10a6a86fb00c7cbf720ccb06a8eea0403
+SHA512 (gnome-calculator-40.beta.tar.xz) = e66627e9b5ec275265b20e8a5e6145d7b7e2a8b73741f4ee5fc8fd6a800acbe8468182c626ee0d68f127ddb2ba6686067535fd50a46f088ea69febb2e0a1a006