.gitignore

@@ -1 +1 @@
-SOURCES/gsettings-desktop-schemas-47.alpha.tar.xz
+SOURCES/gsettings-desktop-schemas-40.0.tar.xz

.gsettings-desktop-schemas.metadata

@@ -1 +1 @@
-039a781bddb89759c396a9449c7c53262a65f448 SOURCES/gsettings-desktop-schemas-47.alpha.tar.xz
+0ce5d005700488882a5bdbe73ebcbc31c319bdf4 SOURCES/gsettings-desktop-schemas-40.0.tar.xz

SOURCES/org.gnome.desktop.interface.rhel.gschema.override

@@ -1,4 +0,0 @@
-[org.gnome.desktop.interface]
-document-font-name='Red Hat Text Regular 11'
-font-name='Red Hat Text Regular 11'
-monospace-font-name='Red Hat Mono Regular 10'

SPECS/gsettings-desktop-schemas.spec

@@ -1,27 +1,16 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 %global debug_package %{nil}
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gsettings-desktop-schemas
-Version:        47~alpha
+Version:        40.0
-Release:        %autorelease
+Release:        6%{?dist}
 Summary:        A collection of GSettings schemas
 
-License:        LGPL-2.1-or-later
+License:        LGPLv2+
 # no homepage exists for this component
 URL:            https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
-Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
+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
@@ -31,13 +20,16 @@ BuildRequires:  meson
 Requires: glib2 >= 2.31.0
 
 # Recommend the default fonts set in the schemas
-%if 0%{?rhel} && 0%{?rhel} >= 10
-Recommends: font(redhattextvf)
-Recommends: font(redhatmonovf)
-%else
 Recommends: font(cantarell)
-Recommends: font(sourcecodepro)
+# For 9.2 we've decided that we will change the default monospace font to align
-%endif
+# 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
@@ -65,10 +57,6 @@ and header files for developing applications that use %{name}.
 %install
 %meson_install
 
-%if 0%{?rhel} && 0%{?rhel} >= 10
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
-%endif
-
 %find_lang %{name} --with-gnome
 
 
@@ -93,102 +81,25 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
 
 
 %changelog
-## START: Generated by rpmautospec
+* Wed Dec 21 2022 Tomas Popela <tpopela@redhat.com> - 40.0-6
-* Tue Jul 16 2024 Felipe Borges <feborges@redhat.com> - 47~alpha-1
+- Require the Source Code Pro font instead of only recommending it to not break
-- Update to 47.alpha
+  systems updated from 9.0.0.
-
+  Resolves: rhbz#2093975
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.0-5
-- Bump release for June 2024 mass rebuild
-
-* Wed Jun 05 2024 Tomas Popela <tpopela@redhat.com> - 46.0-4
-- Use variable fonts
-
-* Tue Apr 09 2024 Tomas Popela <tpopela@redhat.com> - 46.0-3
-- Move to the Red Hat fonts family for RHEL 10
-
-* Tue Apr 09 2024 Tomas Pelka <tpelka@redhat.com> - 46.0-2
-- enable gating
-
-* Thu Mar 28 2024 Felipe Borges <felipeborges@gnome.org> - 46.0-1
-- Update to 46.0
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 46~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 23 2024 David King <amigadave@amigadave.com> - 46~alpha-1
-- Fix version
-
-* Mon Jan 22 2024 Nieves Montero <nmontero@redhat.com> - 46.alpha-1
-- Update to 46.alpha
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Sep 16 2023 Kalev Lember <klember@redhat.com> - 45.0-1
-- Update to 45.0
-
-* Wed Sep 06 2023 Kalev Lember <klember@redhat.com> - 45~rc-1
-- Update to 45.rc
-
-* Fri Aug 11 2023 Kalev Lember <klember@redhat.com> - 45~beta-1
-- Update to 45.beta
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 45~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 04 2023 Kalev Lember <klember@redhat.com> - 45~alpha-1
-- Update to 45.alpha
 
-* Mon Mar 20 2023 David King <amigadave@amigadave.com> - 44.0-1
+* Tue Nov 22 2022 Carlos Garnacho <cgarnach@redhat.com> - 40.0-5
-- Update to 44.0
+- Restore default monospace font to Source Code Pro
+  Resolves: rhbz#2093975
 
-* Wed Feb 15 2023 David King <amigadave@amigadave.com> - 44~beta-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-4
-- Update to 44.beta
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 43.0-2
+* Mon Jul 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+- Fix default monospace font
+- Resolves: #1980001
 
-* Mon Sep 19 2022 Kalev Lember <klember@redhat.com> - 43.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
-- Update to 43.0
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc.1-1
-- Update to 43.rc.1
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 15 2022 Kalev Lember <klember@redhat.com> - 43~alpha-1
-- Update to 43.alpha
-
-* Sun Mar 20 2022 David King <amigadave@amigadave.com> - 42.0-1
-- Update to 42.0
-
-* Tue Mar 08 2022 David King <amigadave@amigadave.com> - 42~rc-1
-- Update to 42.rc
-
-* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 42~beta-1
-- Update to 42.beta
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 David King <amigadave@amigadave.com> - 42~alpha-1
-- Update to 42.alpha
-
-* Sat Sep 18 2021 Kalev Lember <klember@redhat.com> - 41.0-1
-- Update to 41.0
-
-* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 41~rc-1
-- Update to 41.rc
-
-* Wed Aug 18 2021 Florian Müllner <fmuellner@redhat.com> - 41~alpha-1
-- Update to 40.alpha
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-2
-- Override default monospace font in RHEL
 
 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
 - Update to 40.0
@@ -625,5 +536,3 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
 
 * Tue Aug  3 2010 Tomas Bzatek <tbzatek@redhat.com> - 0.0.1-1.git20100729
 - Initial packaging
-
-## END: Generated by rpmautospec