From 83360882b0dee4ca49efe05133f4a7d561125333 Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Fri, 22 Dec 2023 17:45:37 +0100 Subject: [PATCH] update to 0.42 Signed-off-by: Toshaan Bharvani --- ...me.desktop.interface.rhel.gschema.override | 2 + SPECS/gsettings-desktop-schemas.spec | 61 +++++++++++-------- 2 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 SOURCES/org.gnome.desktop.interface.rhel.gschema.override diff --git a/SOURCES/org.gnome.desktop.interface.rhel.gschema.override b/SOURCES/org.gnome.desktop.interface.rhel.gschema.override new file mode 100644 index 0000000..f474a79 --- /dev/null +++ b/SOURCES/org.gnome.desktop.interface.rhel.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.desktop.interface] +monospace-font-name='Monospace 11' diff --git a/SPECS/gsettings-desktop-schemas.spec b/SPECS/gsettings-desktop-schemas.spec index 69454ff..1acfde2 100644 --- a/SPECS/gsettings-desktop-schemas.spec +++ b/SPECS/gsettings-desktop-schemas.spec @@ -3,14 +3,15 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gsettings-desktop-schemas -Version: 40.0 -Release: 6%{?dist} +Version: 42.0 +Release: 1%{?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 +Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz +Source1: org.gnome.desktop.interface.rhel.gschema.override BuildRequires: gettext BuildRequires: glib2-devel >= 2.31.0 @@ -21,15 +22,7 @@ Requires: glib2 >= 2.31.0 # Recommend the default fonts set in the schemas Recommends: font(cantarell) -# 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) +Recommends: font(sourcecodepro) %description gsettings-desktop-schemas contains a collection of GSettings schemas for @@ -57,6 +50,10 @@ and header files for developing applications that use %{name}. %install %meson_install +%if 0%{?rhel} +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas +%endif + %find_lang %{name} --with-gnome @@ -81,25 +78,35 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas %changelog -* Wed Dec 21 2022 Tomas Popela - 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 +* Sun Mar 20 2022 David King - 42.0-1 +- Update to 42.0 + +* Tue Mar 08 2022 David King - 42~rc-1 +- Update to 42.rc + +* Mon Feb 14 2022 David King - 42~beta-1 +- Update to 42.beta + +* Thu Jan 20 2022 Fedora Release Engineering - 42~alpha-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Tue Nov 22 2022 Carlos Garnacho - 40.0-5 -- Restore default monospace font to Source Code Pro - Resolves: rhbz#2093975 +* Mon Jan 10 2022 David King - 42~alpha-1 +- Update to 42.alpha -* Mon Aug 09 2021 Mohan Boddu - 40.0-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Sat Sep 18 2021 Kalev Lember - 41.0-1 +- Update to 41.0 + +* Wed Sep 08 2021 Kalev Lember - 41~rc-1 +- Update to 41.rc + +* Wed Aug 18 2021 Florian Müllner - 41~alpha-1 +- Update to 40.alpha -* Mon Jul 19 2021 Michael Catanzaro - 40.0-3 -- Fix default monospace font -- Resolves: #1980001 +* Thu Jul 22 2021 Fedora Release Engineering - 40.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 40.0-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Mon Jul 19 2021 Michael Catanzaro - 40.0-2 +- Override default monospace font in RHEL * Mon Mar 22 2021 Kalev Lember - 40.0-1 - Update to 40.0