diff --git a/gnome-weather-fix-gettext-domain.patch b/gnome-weather-fix-gettext-domain.patch
new file mode 100644
index 0000000..e912779
--- /dev/null
+++ b/gnome-weather-fix-gettext-domain.patch
@@ -0,0 +1,26 @@
+From bbb0508860004f97a86486d1c0711c195c857005 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
+Date: Sat, 30 Sep 2017 15:41:53 +0200
+Subject: gschema: Fix gettext-domain
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Special thanks to Sébastien Wilmet for help with deciphering Autotools.
+---
+ data/org.gnome.Weather.Application.gschema.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.Weather.Application.gschema.xml b/data/org.gnome.Weather.Application.gschema.xml
+index aaf9d79..2bba122 100644
+--- a/data/org.gnome.Weather.Application.gschema.xml
++++ b/data/org.gnome.Weather.Application.gschema.xml
+@@ -1,4 +1,5 @@
+-<schemalist gettext-domain="org.gnome.Weather.Application">
++<?xml version="1.0" encoding="UTF-8"?>
++<schemalist gettext-domain="org.gnome.Weather">
+   <schema id="org.gnome.Weather.Application" path="/org/gnome/Weather/Application/">
+     <key name="locations" type="av">
+       <default>[]</default>
+-- 
+cgit v0.12
diff --git a/gnome-weather.changes b/gnome-weather.changes
index 84fdc07..1b26e92 100644
--- a/gnome-weather.changes
+++ b/gnome-weather.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Dec  2 21:59:18 UTC 2017 - zaitor@opensuse.org
+
+- Add gnome-weather-fix-gettext-domain.patch: gschema: Fix
+  gettext-domain.
+- Drop post(un) handling of glib2_gsettings_schema_post(un),
+  desktop_database_post(un) and icon_theme_cache_post(un), we have
+  file-triggers taking care of this now.
+- Modernize spec, run spec-cleaner, use autosetup and make_build
+  macros.
+
 -------------------------------------------------------------------
 Mon Sep 11 16:34:26 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gnome-weather.spec b/gnome-weather.spec
index 538f733..801c441 100644
--- a/gnome-weather.spec
+++ b/gnome-weather.spec
@@ -24,7 +24,11 @@ Summary:        Weather App for GNOME
 License:        GPL-2.0+
 Group:          Productivity/Other
 Url:            https://live.gnome.org/Design/Apps/Weather
-Source:         http://download.gnome.org/sources/gnome-weather/3.26/%{name}-%{version}.tar.xz
+
+Source0:        http://download.gnome.org/sources/gnome-weather/3.26/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-weather-fix-gettext-domain.patch zaitor@opensuse.org -- gschema: Fix gettext-domain
+Patch0:         gnome-weather-fix-gettext-domain.patch
+
 BuildRequires:  gjs
 BuildRequires:  intltool >= 0.26
 BuildRequires:  update-desktop-files
@@ -40,7 +44,6 @@ BuildRequires:  pkgconfig(gweather-3.0) >= 3.25.91
 BuildRequires:  pkgconfig(libgeoclue-2.0) >= 2.3.1
 BuildArch:      noarch
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
 
 %description
@@ -61,30 +64,20 @@ This package contains a search provider to enable GNOME Shell to get
 search results from GNOME Weather.
 
 %lang_package
+
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 %suse_update_desktop_file %{_name}.Application Utility DesktopUtility
 %find_lang %{_name}
 
-%post
-%glib2_gsettings_schema_post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%glib2_gsettings_schema_postun
-%desktop_database_postun
-%icon_theme_cache_postun
-
 %files
-%defattr(-,root,root)
 %{_bindir}/%{name}
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/org.gnome.Weather.appdata.xml
@@ -96,7 +89,6 @@ make %{?_smp_mflags}
 %{_datadir}/icons/hicolor/*/apps/%{_name}*
 
 %files -n gnome-shell-search-provider-gnome-weather
-%defattr(-,root,root)
 %dir %{_datadir}/gnome-shell
 %dir %{_datadir}/gnome-shell/search-providers
 %{_datadir}/gnome-shell/search-providers/org.gnome.Weather.Application.search-provider.ini