Accepting request 763357 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/763357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=186

gnome-control-center-fno-common.patch

@@ -0,0 +1,26 @@
+From 92b50d6037ff4d6ccd888beb5b01b55c50bc33ed Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Thu, 9 Jan 2020 14:11:40 -0600
+Subject: [PATCH] Thunderbolt: make BoltError enum a typedef
+
+Fixes error when compiled with -fno-common
+---
+ panels/thunderbolt/bolt-error.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/thunderbolt/bolt-error.h b/panels/thunderbolt/bolt-error.h
+index 39b3eee98..7d3823d35 100644
+--- a/panels/thunderbolt/bolt-error.h
++++ b/panels/thunderbolt/bolt-error.h
+@@ -31,7 +31,7 @@ G_BEGIN_DECLS
+  *
+  * Error codes used inside Bolt.
+  */
+-enum {
++typedef enum {
+   BOLT_ERROR_FAILED = 0,
+   BOLT_ERROR_UDEV,
+   BOLT_ERROR_NOKEY,
+-- 
+2.24.1
+

gnome-control-center.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Jan 10 18:56:00 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- No longer recommend gnome-control-center-lang: the lang package
+  has relevant supplements which pulls it in whenever needed.
+- Move /usr/share/locale/en from the -lang package to the main
+  package: English is installed on all systems. This avoids
+  gnome-control-center-lang being triggered for installation on
+  english-only systems.
+
+-------------------------------------------------------------------
+Thu Jan  9 20:24:39 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Add gnome-control-center-fno-common.patch: fix build with
+  -fno-common (boo#1160393 glgo#GNOME/gnome-control-center!681).
+
 -------------------------------------------------------------------
 Thu Dec 12 02:25:20 UTC 2019 - Xiaoguang Wang <xwang@suse.com>
 

gnome-control-center.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-control-center
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,8 @@ Source0:        %{name}-%{version}.tar.xz
 Patch1:         gnome-control-center-can-not-find-usermod.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-Initialize-GError-to-NULL-before-use.patch xwang@suse.com -- user-accounts: Initialize GError* to NULL before use
 Patch2:         gnome-control-center-Initialize-GError-to-NULL-before-use.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-fno-common.patch boo#1160393 mgorse@suse.com -- fix build with -fno-common.
+Patch3:         gnome-control-center-fno-common.patch
 ### patches for Leap >= 15 plus SLE >= 15, but not TW
 # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
 Patch1001:      gnome-control-center-info-never-use-gnome-software.patch
@@ -113,7 +115,6 @@ Requires:       iso-codes
 Requires:       gnomekbd-tools
 # For the thunderbolt panel
 Recommends:     bolt
-Recommends:     %{name}-lang
 Recommends:     %{name}-user-faces
 # cups-pk-helper should only be recommended, rather than a hard Requires, see boo#904047
 Recommends:     cups-pk-helper
@@ -196,6 +197,7 @@ translation-update-upstream po gnome-control-center-2.0
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # patches for Leap >= 15 plus SLE >= 15, but not TW
 %if 0%{?sle_version} >= 150000
 %patch1001 -p1
@@ -241,6 +243,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svg
+%{_datadir}/locale/en/
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
@@ -272,5 +275,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/gettext/its/sounds.loc
 
 %files lang -f %{name}-2.0.lang
+# english locale should be in the main package
+%exclude %{_datadir}/locale/en
 
 %changelog