.gitignore

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

.gsettings-desktop-schemas.metadata

@@ -1 +1 @@
-0ce5d005700488882a5bdbe73ebcbc31c319bdf4 SOURCES/gsettings-desktop-schemas-40.0.tar.xz
+628a2d779ff1cce0574febeff5cfed165de231e5 SOURCES/gsettings-desktop-schemas-3.32.0.tar.xz

SOURCES/0001-Add-a-setting-for-overlay-scrolling.patch

@@ -0,0 +1,32 @@
+From b94d2334fe6e2578aec32f97b9c3bd0d7709ad12 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 22 May 2019 15:51:19 -0400
+Subject: [PATCH] Add a setting for overlay scrolling
+
+This setting will be used by GTK.
+---
+ schemas/org.gnome.desktop.interface.gschema.xml.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in
+index 22ef50d..680ac4c 100644
+--- a/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -242,5 +242,14 @@
+         If true, gtk+ uses the primary paste selection, usually triggered by a middle mouse button click.
+       </description>
+     </key>
++    <key name="overlay-scrolling" type="b">
++      <default>true</default>
++      <summary>Allow overlay scrolling</summary>
++      <description>
++        Whether scrollbars should be overlayed as indicators. Depending
++        on input devices in use, permanent scrollbars may still be
++        displayed.
++      </description>
++    </key>
+   </schema>
+ </schemalist>
+-- 
+2.23.0
+

SOURCES/0001-schemas-Add-enable-hot-corners-setting.patch

@@ -0,0 +1,37 @@
+From 1e254151b13dbba244a2c8982c4e160a67f7b41b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 13 Jun 2019 14:40:56 +0000
+Subject: [PATCH] schemas: Add 'enable-hot-corners' setting
+
+Whether people love or hate gnome-shell's hot corner depends to large
+extents on hardware sensitivity and habits, which is hard to get right
+universally. So bite the bullet and add an option to enable or disable
+hot corners ...
+
+https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/merge_requests/26
+---
+ schemas/org.gnome.desktop.interface.gschema.xml.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in
+index 22ef50d..1e47888 100644
+--- a/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -228,6 +228,14 @@
+         If true, display weekday in the clock, in addition to time.
+       </description>
+     </key>
++    <key name="enable-hot-corners" type="b">
++      <default>true</default>
++      <summary>Enable hot corners</summary>
++      <description>
++        If true, the activities overview can be accessed by moving the
++        mouse to the top-left corner.
++      </description>
++    </key>
+     <key name="show-battery-percentage" type="b">
+       <default>false</default>
+       <summary>Show battery percentage</summary>
+-- 
+2.21.0
+

SOURCES/0001-schemas-Add-new-lockdown-setting-for-password-showing.patch

@@ -0,0 +1,35 @@
+From 7cb02a1c179e163170b58e3cbd94584624d996c0 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 21 Aug 2019 13:41:08 -0400
+Subject: [PATCH] schemas: Add new lockdown setting for password showing
+
+A convenient feature of many password entries is the
+"Show Password" menu that lets the user see what password
+is hidden behind the bullets they're typing.
+
+While certainly useful, it can also be problematic in some
+deployments, and violate security policies.
+
+This commit adds a new setting to rid users of that "Show Password"
+menu item.
+---
+ schemas/org.gnome.desktop.lockdown.gschema.xml.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.lockdown.gschema.xml.in b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
+index d31fb77..e5e408e 100644
+--- a/schemas/org.gnome.desktop.lockdown.gschema.xml.in
++++ b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
+@@ -79,5 +79,12 @@
+         devices (i.e. flash disks, mobile phones, cameras).
+       </description>
+     </key>
++    <key name="disable-show-password" type="b">
++      <default>false</default>
++      <summary>Disable password showing</summary>
++      <description>
++        Disable the "Show Password" menu item in password entries.
++      </description>
++    </key>
+   </schema>
+ </schemalist>

SOURCES/add-mount-removable-storage-devices-as-read-only-option.patch

@@ -0,0 +1,34 @@
+From 1dec88b007a13860ae8da33687fe4d496053ec98 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 14 May 2019 08:12:59 +0200
+Subject: [PATCH] schemas: Add "mount-removable-storage-devices-as-read-only"
+ option
+
+Add lockdown option to prevent users from writing or modifying files
+on removable storage devices. If enabled, gvfs is going to mount removable
+storage devices (i.e. flashdisks, mobile phones, cameras) as read-only.
+---
+ schemas/org.gnome.desktop.lockdown.gschema.xml.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.lockdown.gschema.xml.in b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
+index 0150b32..d31fb77 100644
+--- a/schemas/org.gnome.desktop.lockdown.gschema.xml.in
++++ b/schemas/org.gnome.desktop.lockdown.gschema.xml.in
+@@ -71,5 +71,13 @@
+         and removing users, as well as changing other users settings.
+       </description>
+     </key>
++    <key name="mount-removable-storage-devices-as-read-only" type="b">
++      <default>false</default>
++      <summary>Mount removable storage devices as read-only</summary>
++      <description>
++        Prevent users from writing or modifying files on removable storage
++        devices (i.e. flash disks, mobile phones, cameras).
++      </description>
++    </key>
+   </schema>
+ </schemalist>
+-- 
+2.21.0
+

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

@@ -0,0 +1,2 @@
+[org.gnome.desktop.interface]
+monospace-font-name='Monospace 11'

SPECS/gsettings-desktop-schemas.spec

@@ -1,35 +1,39 @@
 %global debug_package %{nil}
 
-%global tarball_version %%(echo %{version} | tr '~' '.')
-
 Name:           gsettings-desktop-schemas
-Version:        40.0
+Version:        3.32.0
 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
+URL:            http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas
-Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
+Source0:        http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
+Source1:        org.gnome.desktop.interface.gschema.override
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1709937
+Patch0:         add-mount-removable-storage-devices-as-read-only-option.patch
+# Backport from 3.33.1
+Patch1:         0001-schemas-Add-enable-hot-corners-setting.patch
+Patch2:         0001-Add-a-setting-for-overlay-scrolling.patch
+Patch3:         0001-schemas-Add-new-lockdown-setting-for-password-showing.patch
 
 BuildRequires:  gettext
 BuildRequires:  glib2-devel >= 2.31.0
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  meson
 
+# Older versions need the "scroll-method" key that was removed in 3.19.3
+Conflicts: control-center < 1:3.19.3
+Conflicts: gnome-settings-daemon < 3.19.3
+Conflicts: mutter < 3.19.3
+
 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
+Recommends: font(sourcecodepro)
-# with Fedora and upstream GNOME. After doing the change we've discovered that
+Recommends: font(dejavusansmono)
-# 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
@@ -46,7 +50,7 @@ and header files for developing applications that use %{name}.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version}
+%autosetup -p1
 
 
 %build
@@ -57,12 +61,15 @@ and header files for developing applications that use %{name}.
 %install
 %meson_install
 
+# Restore old monospace default
+cp -a %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
+
 %find_lang %{name} --with-gnome
 
 
 %check
 # Test that the schemas compile
-glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas
+glib-compile-schemas --dry-run --strict $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
 
 
 %files -f %{name}.lang
@@ -81,138 +88,37 @@ 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
+* Tue Jul 20 2021 Ray Strode <rstrode@redhat.com> - 3.32.0-6
-- Require the Source Code Pro font instead of only recommending it to not break
+- Add setting for locking down Show Password in entries
-  systems updated from 9.0.0.
+  Related: #1770302
-  Resolves: rhbz#2093975
 
-* Tue Nov 22 2022 Carlos Garnacho <cgarnach@redhat.com> - 40.0-5
+* Mon Jun 29 2020 Carlos Garnacho <cgarnach@redhat.com> - 3.32.0-5
-- Restore default monospace font to Source Code Pro
+- Recommend DejaVu Sans Mono font as the default monospace font
-  Resolves: rhbz#2093975
+  Resolves: #1656262
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-4
+* Thu Nov 21 2019 Benjamin Otte <otte@redhat.com> - 3.32-0-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Backport setting for overlay scrolling
-  Related: rhbz#1991688
+  Resolves: #1723464
 
-* Mon Jul 19 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-3
+* Tue Jul 23 2019 Florian Müllner <fmuellner@redhat.com> - 3.32-0-3
-- Fix default monospace font
+- Backport 'enable-hot-corners' setting
-- Resolves: #1980001
+  Resolves: #1704355
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
+* Tue Jun 04 2019 Florian Müllner <fmuellner@redhat.com> - 3.32.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Restore previous monospace font default
+  Resolves: #1715761
 
-* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+* Thu May 23 2019 Florian Müllner <fmuellner@redhat.com> - 3.32.0-1
-- Update to 40.0
-
-* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
-- Update to 40.rc
-
-* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
-- Update to 40.beta
-
-* Tue Feb 02 2021 Florian Müllner <fmuellner@redhat.com> - 40~alpha-2.20210202git8c395d5
-- Build snapshot of current upstream
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 40~alpha-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Kalev Lember <klember@redhat.com> - 40~alpha-1
-- Update to 40.alpha
-
-* Thu Dec 03 2020 Adam Williamson <awilliam@redhat.com> - 3.38.0-2
-- Backport an upstream addition of a key GNOME Shell 40 alpha expects
-
-* Mon Sep 14 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
-- Update to 3.38.0
-
-* Mon Sep 07 2020 Kalev Lember <klember@redhat.com> - 3.37.92-1
-- Update to 3.37.92
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Kalev Lember <klember@redhat.com> - 3.37.2-1
-- Update to 3.37.2
-
-* Tue May 05 2020 Kalev Lember <klember@redhat.com> - 3.37.1-1
-- Update to 3.37.1
-
-* Thu Apr 30 2020 Kalev Lember <klember@redhat.com> - 3.36.1-1
-- Update to 3.36.1
-
-* Mon Mar 09 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
-- Update to 3.36.0
-
-* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.91-1
-- Update to 3.35.91
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
-- Update to 3.34.0
-
-* Fri Sep 06 2019 Kalev Lember <klember@redhat.com> - 3.33.92-1
-- Update to 3.33.92
-
-* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
-- Update to 3.33.90
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 18 2019 David King <amigadave@amigadave.com> - 3.33.1-1
-- Update to 3.33.1
-- Update URLs
-- Remove some old Conflicts
-- Use autosetup and buildroot macros
-
-* Mon Jun 24 2019 Kalev Lember <klember@redhat.com> - 3.33.0-1
-- Update to 3.33.0
-
-* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
 - Update to 3.32.0
+  Resolves: #1698930
 
-* Wed Mar 06 2019 Kalev Lember <klember@redhat.com> - 3.31.92-1
+* Wed May 15 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-2
-- Update to 3.31.92
+- Add mount-removable-storage-devices-as-read-only option
-
+- Resovles: #1709937
-* Mon Feb 25 2019 Kalev Lember <klember@redhat.com> - 3.31.91-2
-- Use fonts() provides instead of requiring specific package names (#1677056)
-
-* Wed Feb 20 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
-- Update to 3.31.91
-
-* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.90-2
-- Recommend the default fonts set in the schemas:
-  abattis-cantarell-fonts and adobe-source-code-pro-fonts (#1677056)
-
-* Wed Feb 06 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
-- Update to 3.31.90
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 15 2019 Kalev Lember <klember@redhat.com> - 3.31.0.2-1
-- Update to 3.31.0.2
-- Switch to meson once again now that enums generation is fixed
-
-* Thu Jan 10 2019 Kalev Lember <klember@redhat.com> - 3.31.0.1-2
-- Switch back to autotools to fix missing org.gnome.desktop.enums.xml
-- Add a test to verify that the schemas compile
-
-* Wed Jan 09 2019 Kalev Lember <klember@redhat.com> - 3.31.0.1-1
-- Update to 3.31.0.1
-- Switch to the meson build system
-
-* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.28.1-2
-- Rebuilt against fixed atk (#1626575)
 
 * Tue Sep 04 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
 - Update to 3.28.1
 
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
 - Update to 3.28.0