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#1b606de300432e34c0dc2d436c764df9c608ddc3
This commit is contained in:
DistroBaker 2021-03-19 21:14:22 +00:00
parent 1400dd0d69
commit bb5d25d2ed
4 changed files with 6 additions and 32 deletions

1
.gitignore vendored
View File

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

View File

@ -1,28 +0,0 @@
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

View File

@ -1,7 +1,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-calculator
Version: 40~beta
Version: 40~rc
Release: 1%{?dist}
Summary: A desktop calculator
@ -9,8 +9,6 @@ License: GPLv3+
URL: https://wiki.gnome.org/Apps/Calculator
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
BuildRequires: itstool
@ -102,6 +100,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Calculator
%changelog
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
- Update to 40.rc
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
- Update to 40.beta
- Drop old gcalctool obsoletes

View File

@ -1 +1 @@
SHA512 (gnome-calculator-40.beta.tar.xz) = e66627e9b5ec275265b20e8a5e6145d7b7e2a8b73741f4ee5fc8fd6a800acbe8468182c626ee0d68f127ddb2ba6686067535fd50a46f088ea69febb2e0a1a006
SHA512 (gnome-calculator-40.rc.tar.xz) = dfbe99307beeff398b8b50b90374421e3cf9e809490ff28d2073a78caa10749c2fbc772b1c972fccec3f5f8b958f59ebd1f5340d556e3bd6931445336276ab74