From 20b5c3523dd9a30a5453c71295bf9855477a4d60 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Tue, 21 Oct 2025 16:43:17 +0800 Subject: [PATCH 1/2] [BUG]update to gsettings-desktop-schemas-40.0-7 to #ID2V9Z update to gsettings-desktop-schemas-40.0-7 for bugfix Signed-off-by: Jacob Wang --- ...estart-enabled-on-screensaver-schema.patch | 34 +++++++++++++++++++ dist | 1 + gsettings-desktop-schemas.spec | 23 ++++++------- 3 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 0001-schema-Add-restart-enabled-on-screensaver-schema.patch create mode 100644 dist diff --git a/0001-schema-Add-restart-enabled-on-screensaver-schema.patch b/0001-schema-Add-restart-enabled-on-screensaver-schema.patch new file mode 100644 index 0000000..4f60bb3 --- /dev/null +++ b/0001-schema-Add-restart-enabled-on-screensaver-schema.patch @@ -0,0 +1,34 @@ +From 3a33fed1a56dd3104a1718c91b55bb42bef215fa Mon Sep 17 00:00:00 2001 +From: Joan Torres Lopez +Date: Tue, 15 Jul 2025 11:29:48 +0200 +Subject: [PATCH] schema: Add 'restart-enabled' on screensaver schema + +Originally restart/shutdown was always disabled at lockscreen. +This new setting allows to enable it if desired. + +To keep the original state, the default is still disabled. +--- + schemas/org.gnome.desktop.screensaver.gschema.xml.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +index 5c2db2a..4cf7d3a 100644 +--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in ++++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in +@@ -1,6 +1,13 @@ + + + ++ ++ false ++ Enable restart/shutdown ++ ++ Allow shutdown and restart actions from the lock screen. ++ ++ + + true + Activate when idle +-- +2.49.0 + diff --git a/dist b/dist new file mode 100644 index 0000000..1f9f8c9 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an9_6 diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index dff340c..abf4c7c 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} -%define anolis_release .0.1 + %global tarball_version %%(echo %{version} | tr '~' '.') Name: gsettings-desktop-schemas Version: 40.0 -Release: 6%{anolis_release}%{?dist} +Release: 7%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ @@ -12,6 +12,10 @@ License: LGPLv2+ URL: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz +# RHEL-103998 +# https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/merge_requests/111 +Patch: 0001-schema-Add-restart-enabled-on-screensaver-schema.patch + BuildRequires: gettext BuildRequires: glib2-devel >= 2.31.0 BuildRequires: gobject-introspection-devel @@ -44,13 +48,6 @@ 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 -n %{name}-%{tarball_version} @@ -73,6 +70,7 @@ 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 @@ -85,12 +83,11 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas %{_datadir}/pkgconfig/* %{_datadir}/gir-1.0/GDesktopEnums-3.0.gir -%files doc -%doc AUTHORS MAINTAINERS NEWS README %changelog -* Tue Jun 20 2023 Xiaoping Liu - 40.0-6.0.1 -- Add doc sub package +* Wed Jul 16 2025 Joan Torres - 40.0-7 +- Add an option to enable restart/shutdown at lockscreen + Resolves: RHEL-103998 * Wed Dec 21 2022 Tomas Popela - 40.0-6 - Require the Source Code Pro font instead of only recommending it to not break -- Gitee From eb16fdb71201bf0d3c56b652d1ef27979d92c358 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Mon, 28 Nov 2022 17:49:31 +0800 Subject: [PATCH 2/2] spec: add doc sub package --- gsettings-desktop-schemas.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index abf4c7c..3479a93 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,10 +1,10 @@ %global debug_package %{nil} - +%define anolis_release .0.1 %global tarball_version %%(echo %{version} | tr '~' '.') Name: gsettings-desktop-schemas Version: 40.0 -Release: 7%{?dist} +Release: 7%{anolis_release}%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ @@ -48,6 +48,13 @@ 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 -n %{name}-%{tarball_version} @@ -70,7 +77,6 @@ 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 @@ -83,8 +89,13 @@ glib-compile-schemas --dry-run --strict %{buildroot}%{_datadir}/glib-2.0/schemas %{_datadir}/pkgconfig/* %{_datadir}/gir-1.0/GDesktopEnums-3.0.gir +%files doc +%doc AUTHORS MAINTAINERS NEWS README %changelog +* Tue Oct 21 2025 Xiaoping Liu - 40.0-7.0.1 +- Add doc sub package + * Wed Jul 16 2025 Joan Torres - 40.0-7 - Add an option to enable restart/shutdown at lockscreen Resolves: RHEL-103998 -- Gitee