diff --git a/.gitignore b/.gitignore index 9b4a131..90c3753 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /gnome-weather-3.33.90.tar.xz /gnome-weather-3.34.0.tar.xz /gnome-weather-3.34.1.tar.xz +/gnome-weather-3.36.0.tar.xz diff --git a/deduplicate-cities.patch b/deduplicate-cities.patch deleted file mode 100644 index 4003bcf..0000000 --- a/deduplicate-cities.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eea7b40a51768adc3f7b2cf468d18484e26258ee Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Sun, 22 Mar 2020 19:42:55 -0500 -Subject: [PATCH] Deduplicate cities - -We should not show the same city four times in a row in the locations -popover, nor should we save it multiple times in gsettings. ---- - src/shared/world.js | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/shared/world.js b/src/shared/world.js -index 1c7d8c6..17c3cad 100644 ---- a/src/shared/world.js -+++ b/src/shared/world.js -@@ -230,6 +230,12 @@ var WorldModel = GObject.registerClass({ - } - - _addLocationInternal(newLocation, isCurrentLocation) { -+ for (let i = 0; i < this._infoList.length; i++) { -+ let info = this._infoList[i]; -+ if (info.get_location().equal(newLocation)) -+ return info; -+ } -+ - let info = new GWeather.Info({ location: newLocation, - enabled_providers: this._providers }); - this._addInfoInternal(info, isCurrentLocation); --- -2.24.1 - diff --git a/gnome-weather.spec b/gnome-weather.spec index 1f039c3..9e154e8 100644 --- a/gnome-weather.spec +++ b/gnome-weather.spec @@ -4,16 +4,13 @@ %global libgweather_version 3.28 Name: gnome-weather -Version: 3.34.1 +Version: 3.36.0 Release: 1%{?dist} Summary: A weather application for GNOME License: GPLv2+ and LGPLv2+ and MIT and CC-BY and CC-BY-SA URL: https://wiki.gnome.org/Apps/Weather -Source0: https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz - -# https://gitlab.gnome.org/GNOME/gnome-weather/-/merge_requests/26 -Patch0: deduplicate-cities.patch +Source0: https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz BuildArch: noarch @@ -76,6 +73,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Weather.des %{_datadir}/org.gnome.Weather/ %changelog +* Mon Apr 06 2020 Kalev Lember - 3.36.0-1 +- Update to 3.36.0 + * Fri Apr 03 2020 Kalev Lember - 3.34.1-1 - Update to 3.34.1 diff --git a/sources b/sources index dca7abb..7252ed1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-weather-3.34.1.tar.xz) = 01fba7c79c2ebfebfc33f7d6f7d7b9b17ed3a55aacdf96d3dfddc9c446ab6ca125602ccf9b896c949d46291fb3688165fab4272d41092f303ca604068e817ca7 +SHA512 (gnome-weather-3.36.0.tar.xz) = a0a53066a8d0f752e553314574ef416e8c9d4eaea7c4e81e403be6a51cc5f2926a2c8e24d975bd5da4076ece02d7ec3f49fa8dd6a6f442bb049efb2ebbd0a831