From 14273415c925275bfb0b3759667083ef0885dad7 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Oct 07 2019 17:01:02 +0000
Subject: Add patch to fix resetting of system wide format locale (rhbz#1759221)


---

diff --git a/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch b/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch
new file mode 100644
index 0000000..06be595
--- /dev/null
+++ b/0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch
@@ -0,0 +1,31 @@
+From ce5adc79529590d36d9febc0b21777b47287ba40 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 7 Oct 2019 18:40:43 +0200
+Subject: [PATCH] region: Explicitly update LC_* even when matching LANG
+
+localed will not update the LC_* variables if they are not given. This
+means that should the user switch the formats away from LANG and then
+back, they will not be reset appropriately.
+
+Simply always setting the variables even if the match will fix this.
+---
+ panels/region/cc-region-panel.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+index 39b1f9d7b..776f344b7 100644
+--- a/panels/region/cc-region-panel.c
++++ b/panels/region/cc-region-panel.c
+@@ -1346,8 +1346,7 @@ set_localed_locale (CcRegionPanel *self)
+         lang_value = g_strconcat ("LANG=", self->system_language, NULL);
+         g_variant_builder_add (b, "s", lang_value);
+ 
+-        if (self->system_region != NULL &&
+-            g_strcmp0 (self->system_language, self->system_region) != 0) {
++        if (self->system_region != NULL) {
+                 g_autofree gchar *time_value = NULL;
+                 g_autofree gchar *numeric_value = NULL;
+                 g_autofree gchar *monetary_value = NULL;
+-- 
+2.23.0
+
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 94026cf..85d959d 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -10,7 +10,7 @@
 
 Name:           gnome-control-center
 Version:        3.34.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -20,6 +20,9 @@ Source0:        https://download.gnome.org/sources/gnome-control-center/3.34/gno
 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
 Patch0:         distro-logo.patch
 
+# https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/586
+Patch1:         0001-region-Explicitly-update-LC_-even-when-matching-LANG.patch
+
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -189,6 +192,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Mon Oct 07 2019 Benjamin Berg <bberg@redhat.com> - 3.34.1-2
+- Add patch to fix resetting of system wide format locale (rhbz#1759221)
+
 * Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
 - Update to 3.34.1