From c50d11f9cdac565caf35ecd721c79bf794bbff49334409e6743b4d09d7bcf74e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 22 Mar 2018 09:41:34 +0000
Subject: [PATCH] Accepting request 589316 from home:dimstar:t-u-u

t-u-u / boo#1086036

OBS-URL: https://build.opensuse.org/request/show/589316
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=321
---
 gnome-settings-daemon.changes | 7 +++++++
 gnome-settings-daemon.spec    | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index d0a2d0d..c97eb8a 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 20 17:20:36 UTC 2018 - dimstar@opensuse.org
+
+- Unconditionally enable translation-update-upstream: on
+  Tumbleweed, this results in a NOP and for Leap in SLE paid
+  translations being used (boo#1086036).
+
 -------------------------------------------------------------------
 Mon Mar 12 16:04:30 UTC 2018 - dimstar@opensuse.org
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index c65185c..8372d1e 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -52,11 +52,13 @@ Patch7:         gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patc
 Patch9:         gnome-settings-daemon-bgo793253.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
+BuildRequires:  gnome-patch-translation
 BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 # For directory ownership; it's fine to BuildRequire it since it's also a Requires
 BuildRequires:  polkit
+BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(alsa)
@@ -100,10 +102,6 @@ Recommends:     nautilus
 %if 0%{?suse_version} == 1315
 BuildRequires:  gnome-common
 %endif
-%if !0%{?is_opensuse}
-BuildRequires:  gnome-patch-translation
-BuildRequires:  translation-update-upstream
-%endif
 %if 0%{?suse_version} == 1315
 BuildRequires:  pkgconfig(packagekit-glib2)
 %endif
@@ -151,9 +149,9 @@ contact the settings daemon via its DBus interface.
 
 %prep
 %setup -q
-%if !0%{?is_opensuse}
 translation-update-upstream
 gnome-patch-translation-prepare
+%if !0%{?is_opensuse}
 %patch1 -p1
 %patch2 -p1
 %patch3