diff --git a/0001-Add-a-setting-for-overlay-scrolling.patch b/0001-Add-a-setting-for-overlay-scrolling.patch deleted file mode 100644 index 44bf5184a46d2678814f46e056425af7b13d01dd..0000000000000000000000000000000000000000 --- a/0001-Add-a-setting-for-overlay-scrolling.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b94d2334fe6e2578aec32f97b9c3bd0d7709ad12 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -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. - - -+ -+ true -+ Allow overlay scrolling -+ -+ Whether scrollbars should be overlayed as indicators. Depending -+ on input devices in use, permanent scrollbars may still be -+ displayed. -+ -+ - - --- -2.23.0 - diff --git a/0001-schemas-Add-enable-hot-corners-setting.patch b/0001-schemas-Add-enable-hot-corners-setting.patch deleted file mode 100644 index 29612f954c5c2de79b327e8e1f9c96f688084001..0000000000000000000000000000000000000000 --- a/0001-schemas-Add-enable-hot-corners-setting.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1e254151b13dbba244a2c8982c4e160a67f7b41b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -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. - - -+ -+ true -+ Enable hot corners -+ -+ If true, the activities overview can be accessed by moving the -+ mouse to the top-left corner. -+ -+ - - false - Show battery percentage --- -2.21.0 - diff --git a/0001-schemas-Add-new-lockdown-setting-for-password-showing.patch b/0001-schemas-Add-new-lockdown-setting-for-password-showing.patch deleted file mode 100644 index 07fe550f28067f27d359a3f6e1656c3604de29a6..0000000000000000000000000000000000000000 --- a/0001-schemas-Add-new-lockdown-setting-for-password-showing.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7cb02a1c179e163170b58e3cbd94584624d996c0 Mon Sep 17 00:00:00 2001 -From: Ray Strode -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). - - -+ -+ false -+ Disable password showing -+ -+ Disable the "Show Password" menu item in password entries. -+ -+ - - diff --git a/add-mount-removable-storage-devices-as-read-only-option.patch b/add-mount-removable-storage-devices-as-read-only-option.patch deleted file mode 100644 index 2f333a96b3048b4298aa368eb4aac3cdd701154d..0000000000000000000000000000000000000000 --- a/add-mount-removable-storage-devices-as-read-only-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1dec88b007a13860ae8da33687fe4d496053ec98 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -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. - - -+ -+ false -+ Mount removable storage devices as read-only -+ -+ Prevent users from writing or modifying files on removable storage -+ devices (i.e. flash disks, mobile phones, cameras). -+ -+ - - --- -2.21.0 - diff --git a/gsettings-desktop-schemas-3.32.0.tar.xz b/gsettings-desktop-schemas-3.32.0.tar.xz deleted file mode 100644 index a233e2b64c4f1bf78d22351e3efe09b353383ec9..0000000000000000000000000000000000000000 Binary files a/gsettings-desktop-schemas-3.32.0.tar.xz and /dev/null differ diff --git a/gsettings-desktop-schemas-40.0.tar.xz b/gsettings-desktop-schemas-40.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..4f9643f83ee60f75d0a8489e3f9e502d5bd844de Binary files /dev/null and b/gsettings-desktop-schemas-40.0.tar.xz differ diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 4f46d8cd2148552d8785287f5d29ad8fbc409ec3..f1d7366952e0cef36bcd4db8fe86e5e818cd87f9 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,39 +1,28 @@ %global debug_package %{nil} +%define anolis_release .0.1 +%global tarball_version %%(echo %{version} | tr '~' '.') Name: gsettings-desktop-schemas -Version: 3.32.0 -Release: 6%{?dist} +Version: 40.0 +Release: 4%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ # no homepage exists for this component -URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas -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 +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 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) Recommends: font(sourcecodepro) -Recommends: font(dejavusansmono) %description gsettings-desktop-schemas contains a collection of GSettings schemas for @@ -48,9 +37,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +Doc pages for %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{tarball_version} %build @@ -61,19 +57,19 @@ 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 +%if 0%{?rhel} +cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas +%endif %find_lang %{name} --with-gnome %check # Test that the schemas compile -glib-compile-schemas --dry-run --strict $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas +glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas %files -f %{name}.lang -%doc AUTHORS MAINTAINERS NEWS README %license COPYING %{_datadir}/glib-2.0/schemas/* %{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert @@ -86,39 +82,136 @@ glib-compile-schemas --dry-run --strict $RPM_BUILD_ROOT%{_datadir}/glib-2.0/sche %{_datadir}/pkgconfig/* %{_datadir}/gir-1.0/GDesktopEnums-3.0.gir +%files doc +%doc AUTHORS MAINTAINERS NEWS README %changelog -* Tue Jul 20 2021 Ray Strode - 3.32.0-6 -- Add setting for locking down Show Password in entries - Related: #1770302 +* Wed Nov 23 2022 Xiaoping Liu - 40.0-4.0.1 +- Add doc sub package + +* Mon Aug 09 2021 Mohan Boddu - 40.0-4 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Mon Jul 19 2021 Michael Catanzaro - 40.0-3 +- Fix default monospace font +- Resolves: #1980001 + +* Fri Apr 16 2021 Mohan Boddu - 40.0-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Mon Mar 22 2021 Kalev Lember - 40.0-1 +- Update to 40.0 + +* Mon Mar 15 2021 Kalev Lember - 40~rc-1 +- Update to 40.rc + +* Wed Feb 17 2021 Kalev Lember - 40~beta-1 +- Update to 40.beta + +* Tue Feb 02 2021 Florian Müllner - 40~alpha-2.20210202git8c395d5 +- Build snapshot of current upstream + +* Tue Jan 26 2021 Fedora Release Engineering - 40~alpha-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Kalev Lember - 40~alpha-1 +- Update to 40.alpha + +* Thu Dec 03 2020 Adam Williamson - 3.38.0-2 +- Backport an upstream addition of a key GNOME Shell 40 alpha expects + +* Mon Sep 14 2020 Kalev Lember - 3.38.0-1 +- Update to 3.38.0 + +* Mon Sep 07 2020 Kalev Lember - 3.37.92-1 +- Update to 3.37.92 + +* Tue Jul 28 2020 Fedora Release Engineering - 3.37.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Jun 29 2020 Carlos Garnacho - 3.32.0-5 -- Recommend DejaVu Sans Mono font as the default monospace font - Resolves: #1656262 +* Tue Jul 21 2020 Kalev Lember - 3.37.2-1 +- Update to 3.37.2 -* Thu Nov 21 2019 Benjamin Otte - 3.32-0-4 -- Backport setting for overlay scrolling - Resolves: #1723464 +* Tue May 05 2020 Kalev Lember - 3.37.1-1 +- Update to 3.37.1 -* Tue Jul 23 2019 Florian Müllner - 3.32-0-3 -- Backport 'enable-hot-corners' setting - Resolves: #1704355 +* Thu Apr 30 2020 Kalev Lember - 3.36.1-1 +- Update to 3.36.1 -* Tue Jun 04 2019 Florian Müllner - 3.32.0-2 -- Restore previous monospace font default - Resolves: #1715761 +* Mon Mar 09 2020 Kalev Lember - 3.36.0-1 +- Update to 3.36.0 -* Thu May 23 2019 Florian Müllner - 3.32.0-1 +* Mon Feb 17 2020 Kalev Lember - 3.35.91-1 +- Update to 3.35.91 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.34.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Sep 09 2019 Kalev Lember - 3.34.0-1 +- Update to 3.34.0 + +* Fri Sep 06 2019 Kalev Lember - 3.33.92-1 +- Update to 3.33.92 + +* Mon Aug 12 2019 Kalev Lember - 3.33.90-1 +- Update to 3.33.90 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.33.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 David King - 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 - 3.33.0-1 +- Update to 3.33.0 + +* Mon Mar 11 2019 Kalev Lember - 3.32.0-1 - Update to 3.32.0 - Resolves: #1698930 -* Wed May 15 2019 Ondrej Holy - 3.28.1-2 -- Add mount-removable-storage-devices-as-read-only option -- Resovles: #1709937 +* Wed Mar 06 2019 Kalev Lember - 3.31.92-1 +- Update to 3.31.92 + +* Mon Feb 25 2019 Kalev Lember - 3.31.91-2 +- Use fonts() provides instead of requiring specific package names (#1677056) + +* Wed Feb 20 2019 Kalev Lember - 3.31.91-1 +- Update to 3.31.91 + +* Tue Feb 19 2019 Kalev Lember - 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 - 3.31.90-1 +- Update to 3.31.90 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.31.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 15 2019 Kalev Lember - 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 - 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 - 3.31.0.1-1 +- Update to 3.31.0.1 +- Switch to the meson build system + +* Fri Sep 07 2018 Kalev Lember - 3.28.1-2 +- Rebuilt against fixed atk (#1626575) * Tue Sep 04 2018 Kalev Lember - 3.28.1-1 - Update to 3.28.1 +* Fri Jul 13 2018 Fedora Release Engineering - 3.28.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 12 2018 Kalev Lember - 3.28.0-1 - Update to 3.28.0 diff --git a/org.gnome.desktop.interface.gschema.override b/org.gnome.desktop.interface.rhel.gschema.override similarity index 100% rename from org.gnome.desktop.interface.gschema.override rename to org.gnome.desktop.interface.rhel.gschema.override