diff --git a/99_kiran-server.gschema.override b/99_kiran-server.gschema.override index 0ff8351..a3ec177 100644 --- a/99_kiran-server.gschema.override +++ b/99_kiran-server.gschema.override @@ -4,4 +4,7 @@ disable-hibernate=true [com.kylinsec.kiran.xsettings] net-icon-theme-name="Summer" -net-theme-name="Kiran-dark" \ No newline at end of file +net-theme-name="Kiran-dark" + +[com.kylinsec.kiran.screensaver] +idle-activation-lock=false diff --git a/kiran-desktop.spec b/kiran-desktop.spec index d9207c7..4b58c40 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -7,7 +7,7 @@ Name: kiran-desktop Version: 2.6.0 -Release: 7%{?dist} +Release: 8 Summary: Kiran desktop environment #Group: License: MulanPSL-2.0 @@ -20,7 +20,7 @@ Source1: 99_unikylin-mate-marco-general-theme.gschema.override Source2: 99_kiran-org-mate-NotificationDaemon.gschema.override # 服务器版本定制配置,禁用Xorg screensaver以及DPMS Source3: 99-disable-xorg-dpms.conf -# 服务器版本GSetting override +# 服务器版本定制配置,禁用开始菜单休眠/待机 Source4: 99_kiran-server.gschema.override # Kiran Mime Apps Source5: kiran-mimeapps.list @@ -89,6 +89,7 @@ Requires: gvfs-fuse3 Requires: gvfs-fuse %endif + Requires: mate-desktop Requires: mate-menus @@ -191,9 +192,11 @@ sed -i "/\[power\]/,/Available=true/s/Available=true/Available=false/g" %{_libdi mv %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop.disable %endif + %postun /usr/bin/update-desktop-database &> /dev/null || : + %posttrans glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : @@ -208,7 +211,11 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif + %changelog +* Tue Apr 09 2024 liuxinhao - 2.6.0-8 +- KYOS-F: set idle lock to false by default in the server version (#31787) + * Sun Apr 07 2024 liuxinhao - 2.6.0-7 - KYOS-F: kylinsec-server set default theme to kiran-dark - KYOS-B: remove dependencies(kiran-themes),change dependencies(gvfs-fuse3) @@ -216,6 +223,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : * Wed Mar 27 2024 liuxinhao - 2.6.0-6 - KYOS-F: set Summer as the default icon theme for server(#31786) +* Wed Mar 27 2024 liuxinhao - 2.6.0-5.kb1 +- rebuild for 3.5.2 + * Wed Mar 27 2024 liuxinhao - 2.6.0-5 - KYOS-F: Disable power management for server versions(#31787)