From bb5d25d2eddf3e8e0000fce5df436071290f64a5 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 19 Mar 2021 21:14:22 +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-calculator.git#1b606de300432e34c0dc2d436c764df9c608ddc3 --- .gitignore | 1 + ...-appdata-Fix-release-tag-for-40.beta.patch | 28 ------------------- gnome-calculator.spec | 7 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 0001-appdata-Fix-release-tag-for-40.beta.patch diff --git a/.gitignore b/.gitignore index 2941e8e..fc1093b 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-appdata-Fix-release-tag-for-40.beta.patch b/0001-appdata-Fix-release-tag-for-40.beta.patch deleted file mode 100644 index eccda68..0000000 --- a/0001-appdata-Fix-release-tag-for-40.beta.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13a72ad5f993f1d5c0c5bb42f56e808e357ab440 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -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 @@ - gnome-calculator - - -- -+ - --

Overview of changes in gnome-calculator 40.alpha

-+

Overview of changes in gnome-calculator 40.beta

-
    -
  • Updated Translations
  • -
  • Fixed CI build (Robert Roth)
  • --- -2.29.2 - diff --git a/gnome-calculator.spec b/gnome-calculator.spec index 2389805..1becbd8 100644 --- a/gnome-calculator.spec +++ b/gnome-calculator.spec @@ -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 - 40~rc-1 +- Update to 40.rc + * Thu Feb 18 2021 Kalev Lember - 40~beta-1 - Update to 40.beta - Drop old gcalctool obsoletes diff --git a/sources b/sources index 4ca63ae..8ef555b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-calculator-40.beta.tar.xz) = e66627e9b5ec275265b20e8a5e6145d7b7e2a8b73741f4ee5fc8fd6a800acbe8468182c626ee0d68f127ddb2ba6686067535fd50a46f088ea69febb2e0a1a006 +SHA512 (gnome-calculator-40.rc.tar.xz) = dfbe99307beeff398b8b50b90374421e3cf9e809490ff28d2073a78caa10749c2fbc772b1c972fccec3f5f8b958f59ebd1f5340d556e3bd6931445336276ab74