From a8f85b5d7623caf245e7ac39dacdbfe1ac8fba59 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Fri, 21 Jul 2023 15:59:47 +0800 Subject: [PATCH 1/3] update to gnome-settings-daemon-40.0.1-11.el9_2 Signed-off-by: Zhao Hang --- 1001-fix-systemd-build.patch | 13 ------------- dist | 1 + gnome-settings-daemon.spec | 25 +++++-------------------- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 1001-fix-systemd-build.patch create mode 100644 dist diff --git a/1001-fix-systemd-build.patch b/1001-fix-systemd-build.patch deleted file mode 100644 index bad99ed..0000000 --- a/1001-fix-systemd-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 88e4f87..7fa385e 100644 ---- a/meson.build -+++ b/meson.build -@@ -111,7 +111,7 @@ x11_dep = dependency('x11') - - enable_systemd = get_option('systemd') - if enable_systemd -- systemd_dep = dependency('systemd', version: '>= 243', required: false) -+ systemd_dep = dependency('systemd', version: '>= 239', required: false) - assert(systemd_dep.found(), 'Systemd support explicitly required, but systemd not found') - - systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', diff --git a/dist b/dist new file mode 100644 index 0000000..f0303ad --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an9_2 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index c2023f7..327d12e 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 - %global glib2_version 2.56 %global colord_version 1.4.5 %global geocode_glib_version 3.10.0 @@ -13,7 +11,7 @@ Name: gnome-settings-daemon Version: 40.0.1 -Release: 10%{anolis_release}%{?dist} +Release: 11%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -68,15 +66,12 @@ Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: libgweather%{?_isa} >= %{libgweather_version} -Requires: glibc Patch00001: 0001-power-Enable-power-saver-profile-when-low-on-battery.patch Patch00002: subscription-manager-support.patch Patch00003: im-module-setting-fix.patch Patch00004: print-notifications-clear-in-stop.patch Patch00005: 0001-power-Respect-the-nothing-power-button-action-for-VM.patch -Patch00006: 0001-Make-power-button-action-always-power-off-when-chass.patch -Patch1001: 1001-fix-systemd-build.patch %description A daemon to share settings from GNOME to other applications. It also @@ -90,14 +85,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} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %autosetup -p1 -n %{name}-%{tarball_version} @@ -114,6 +101,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %files -f %{name}.lang %license COPYING +%doc AUTHORS NEWS # list daemons explicitly, so we notice if one goes missing # some of these don't have a separate gschema @@ -208,13 +196,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %{_includedir}/gnome-settings-daemon-40 %{_libdir}/pkgconfig/gnome-settings-daemon.pc -%files doc -%doc AUTHORS NEWS - %changelog -* Tue Jun 20 2023 Zhao Hang - 40.0.1-10.0.1 -- Add doc sub package -- Modify systemd buildrequirement to version 239 and rebuild with systemd-239 () +* Tue Mar 28 2023 Felipe Borges - 40.0.1-11 +- Revert "power-button-action" always poweroff on Server chassis + Resolves: #2182380 * Wed Feb 22 2023 Felipe Borges - 40.0.1-10 - Default power-button-action to poweroff on servers -- Gitee From d803135fa72919c13418d543d2f5edbf1e35eba5 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Sun, 17 Jul 2022 10:52:58 +0800 Subject: [PATCH 2/3] Add doc sub package --- gnome-settings-daemon.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 327d12e..e0591b8 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,3 +1,5 @@ +%define anolis_release .0.1 + %global glib2_version 2.56 %global colord_version 1.4.5 %global geocode_glib_version 3.10.0 @@ -11,7 +13,7 @@ Name: gnome-settings-daemon Version: 40.0.1 -Release: 11%{?dist} +Release: 11%{anolis_release}%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -66,6 +68,7 @@ Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: libgweather%{?_isa} >= %{libgweather_version} +Requires: glibc Patch00001: 0001-power-Enable-power-saver-profile-when-low-on-battery.patch Patch00002: subscription-manager-support.patch @@ -85,6 +88,14 @@ 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} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %autosetup -p1 -n %{name}-%{tarball_version} @@ -101,7 +112,6 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %files -f %{name}.lang %license COPYING -%doc AUTHORS NEWS # list daemons explicitly, so we notice if one goes missing # some of these don't have a separate gschema @@ -196,7 +206,13 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %{_includedir}/gnome-settings-daemon-40 %{_libdir}/pkgconfig/gnome-settings-daemon.pc +%files doc +%doc AUTHORS NEWS + %changelog +* Mon Jul 24 2023 Zhao Hang - 40.0.1-11.0.1 +- Add doc sub package + * Tue Mar 28 2023 Felipe Borges - 40.0.1-11 - Revert "power-button-action" always poweroff on Server chassis Resolves: #2182380 -- Gitee From 6651958cd0fbfa804c95beefc0e7c5a653f50130 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 1 Dec 2022 11:07:07 +0800 Subject: [PATCH 3/3] Modify systemd buildrequirement and rebuild --- 1001-fix-systemd-build.patch | 13 +++++++++++++ gnome-settings-daemon.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 1001-fix-systemd-build.patch diff --git a/1001-fix-systemd-build.patch b/1001-fix-systemd-build.patch new file mode 100644 index 0000000..bad99ed --- /dev/null +++ b/1001-fix-systemd-build.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 88e4f87..7fa385e 100644 +--- a/meson.build ++++ b/meson.build +@@ -111,7 +111,7 @@ x11_dep = dependency('x11') + + enable_systemd = get_option('systemd') + if enable_systemd +- systemd_dep = dependency('systemd', version: '>= 243', required: false) ++ systemd_dep = dependency('systemd', version: '>= 239', required: false) + assert(systemd_dep.found(), 'Systemd support explicitly required, but systemd not found') + + systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index e0591b8..6d20cda 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -75,6 +75,7 @@ Patch00002: subscription-manager-support.patch Patch00003: im-module-setting-fix.patch Patch00004: print-notifications-clear-in-stop.patch Patch00005: 0001-power-Respect-the-nothing-power-button-action-for-VM.patch +Patch1001: 1001-fix-systemd-build.patch %description A daemon to share settings from GNOME to other applications. It also @@ -212,6 +213,7 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %changelog * Mon Jul 24 2023 Zhao Hang - 40.0.1-11.0.1 - Add doc sub package +- Modify systemd buildrequirement to version 239 and rebuild with systemd-239 () * Tue Mar 28 2023 Felipe Borges - 40.0.1-11 - Revert "power-button-action" always poweroff on Server chassis -- Gitee