From 22247a97038df816f40ffca9adda4e905da44ead Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 28 2023 09:02:15 +0000
Subject: import gsettings-desktop-schemas-40.0-6.el9


---

diff --git a/SOURCES/org.gnome.desktop.interface.rhel.gschema.override b/SOURCES/org.gnome.desktop.interface.rhel.gschema.override
deleted file mode 100644
index f474a79..0000000
--- a/SOURCES/org.gnome.desktop.interface.rhel.gschema.override
+++ /dev/null
@@ -1,2 +0,0 @@
-[org.gnome.desktop.interface]
-monospace-font-name='Monospace 11'
diff --git a/SPECS/gsettings-desktop-schemas.spec b/SPECS/gsettings-desktop-schemas.spec
index ce7c690..69454ff 100644
--- a/SPECS/gsettings-desktop-schemas.spec
+++ b/SPECS/gsettings-desktop-schemas.spec
@@ -4,14 +4,13 @@
 
 Name:           gsettings-desktop-schemas
 Version:        40.0
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        A collection of GSettings schemas
 
 License:        LGPLv2+
 # no homepage exists for this component
 URL:            https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
 Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
-Source1:        org.gnome.desktop.interface.rhel.gschema.override
 
 BuildRequires:  gettext
 BuildRequires:  glib2-devel >= 2.31.0
@@ -22,7 +21,15 @@ Requires: glib2 >= 2.31.0
 
 # Recommend the default fonts set in the schemas
 Recommends: font(cantarell)
-Recommends: font(sourcecodepro)
+# For 9.2 we've decided that we will change the default monospace font to align
+# with Fedora and upstream GNOME. After doing the change we've discovered that
+# the font is not installed together with the g-d-s update when updating from
+# RHEL 9.0.0, This is because Source Code Pro was in BUILDROOT for 9.0.0 and
+# was moved to AppStream in 9.1.0. The "Recommends" specified below is not
+# applied on upgrade and we have to change it for "Requires" to install the font
+# correctly.
+#Recommends: font(sourcecodepro)
+Requires: font(sourcecodepro)
 
 %description
 gsettings-desktop-schemas contains a collection of GSettings schemas for
@@ -50,10 +57,6 @@ and header files for developing applications that use %{name}.
 %install
 %meson_install
 
-%if 0%{?rhel}
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
-%endif
-
 %find_lang %{name} --with-gnome
 
 
@@ -78,6 +81,15 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Wed Dec 21 2022 Tomas Popela <tpopela@redhat.com> - 40.0-6
+- Require the Source Code Pro font instead of only recommending it to not break
+  systems updated from 9.0.0.
+  Resolves: rhbz#2093975
+
+* Tue Nov 22 2022 Carlos Garnacho <cgarnach@redhat.com> - 40.0-5
+- Restore default monospace font to Source Code Pro
+  Resolves: rhbz#2093975
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688