From 6bc7c60b90ae16265861475c198c04d391c306eb Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Apr 03 2020 20:53:59 +0000
Subject: Update to 3.34.1


---

diff --git a/.gitignore b/.gitignore
index d14ccab..9b4a131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
 /gnome-weather-3.32.2.tar.xz
 /gnome-weather-3.33.90.tar.xz
 /gnome-weather-3.34.0.tar.xz
+/gnome-weather-3.34.1.tar.xz
diff --git a/gnome-weather.spec b/gnome-weather.spec
index 32176f9..1f039c3 100644
--- a/gnome-weather.spec
+++ b/gnome-weather.spec
@@ -4,8 +4,8 @@
 %global libgweather_version 3.28
 
 Name:		gnome-weather
-Version:	3.34.0
-Release:	3%{?dist}
+Version:	3.34.1
+Release:	1%{?dist}
 Summary:	A weather application for GNOME
 
 License:	GPLv2+ and LGPLv2+ and MIT and CC-BY and CC-BY-SA
@@ -14,8 +14,6 @@ Source0:	https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.
 
 # https://gitlab.gnome.org/GNOME/gnome-weather/-/merge_requests/26
 Patch0:         deduplicate-cities.patch
-# https://gitlab.gnome.org/GNOME/gnome-weather/-/merge_requests/27
-Patch1:         revert-find-nearest-city.patch
 
 BuildArch:	noarch
 
@@ -78,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Weather.des
 %{_datadir}/org.gnome.Weather/
 
 %changelog
+* Fri Apr 03 2020 Kalev Lember <klember@redhat.com> - 3.34.1-1
+- Update to 3.34.1
+
 * Wed Mar 25 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 3.34.0-3
 - Fix weather selecting the wrong cites. Also: deduplicate recent cities.
 
diff --git a/revert-find-nearest-city.patch b/revert-find-nearest-city.patch
deleted file mode 100644
index a6b5fb3..0000000
--- a/revert-find-nearest-city.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 49e6a52a143bfcf1dc7da87f356dd07db6a5ce1e Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Tue, 24 Mar 2020 13:57:58 -0500
-Subject: [PATCH 1/2] Revert "shared/world.js: don't use detached location from
- settings"
-
-This reverts commit 01bf03ab8cf805a5a2706a03c5615b42c020e41f.
-
-This badly broke location saving. Fixes #90
----
- src/shared/world.js | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/src/shared/world.js b/src/shared/world.js
-index 1c7d8c6..07feade 100644
---- a/src/shared/world.js
-+++ b/src/shared/world.js
-@@ -103,15 +103,9 @@ var WorldModel = GObject.registerClass({
-         let info = null;
-         for (let i = locations.length - 1; i >= 0; i--) {
-             let variant = locations[i];
--            let world = this._world.deserialize(variant);
--            if (world != null) {
--                let coords = world.get_coords();
--                let location = this._world.find_nearest_city(coords[0], coords[1]);
--
--                info = this._addLocationInternal(location, false);
--            } else {
--                log('Failed to deserialize location from GVariant:' + variant.print(true));
--            }
-+            let location = this._world.deserialize(variant);
-+
-+            info = this._addLocationInternal(location, false);
-         }
-     }
- 
--- 
-2.24.1
-
-
-From 1efc471d9c34be9453b5e457fdebd973f5da632d Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Tue, 24 Mar 2020 13:58:14 -0500
-Subject: [PATCH 2/2] Revert "app: Use find_nearest_city() instead of
- new_detached()"
-
-This reverts commit f07286f13a3daf8fa5a44da8dfeef36e9df44ed0.
----
- src/app/currentLocationController.js | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/app/currentLocationController.js b/src/app/currentLocationController.js
-index 644ac63..67538d2 100644
---- a/src/app/currentLocationController.js
-+++ b/src/app/currentLocationController.js
-@@ -87,11 +87,10 @@ var CurrentLocationController = class CurrentLocationController {
-     _onLocationUpdated(simple) {
-         let geoclueLocation = simple.get_location();
- 
--        this.currentLocation = GWeather.Location.get_world()
--                                                .find_nearest_city(
--                                                    geoclueLocation.latitude,
--                                                    geoclueLocation.longitude
--                                                );
-+        this.currentLocation = GWeather.Location.new_detached(geoclueLocation.description,
-+                                                              null,
-+                                                              geoclueLocation.latitude,
-+                                                              geoclueLocation.longitude);
-         this._world.currentLocationChanged(this.currentLocation);
-     }
- 
--- 
-2.24.1
-
diff --git a/sources b/sources
index c098f66..dca7abb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-weather-3.34.0.tar.xz) = f8fd91deef1516b4a18a599415d54a04413a5771916a5c7105e22876e239fe22c325f2e3196f7bff23293893c85fe886fa3a8b4b380aecab62b5b02de58c7185
+SHA512 (gnome-weather-3.34.1.tar.xz) = 01fba7c79c2ebfebfc33f7d6f7d7b9b17ed3a55aacdf96d3dfddc9c446ab6ca125602ccf9b896c949d46291fb3688165fab4272d41092f303ca604068e817ca7