From 8157f2bd60e8621c80c08ad2f767374d4f6f041b Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Sun, 7 Apr 2024 17:17:39 +0800 Subject: [PATCH] kylinsec-server set default theme to kiran-dark,kylinsec-server set default theme to kiran-dark --- 99_kiran-server.gschema.override | 1 + kiran-desktop.spec | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/99_kiran-server.gschema.override b/99_kiran-server.gschema.override index 986bd86..0ff8351 100644 --- a/99_kiran-server.gschema.override +++ b/99_kiran-server.gschema.override @@ -4,3 +4,4 @@ disable-hibernate=true [com.kylinsec.kiran.xsettings] net-icon-theme-name="Summer" +net-theme-name="Kiran-dark" \ No newline at end of file diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 445f685..d9207c7 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -7,7 +7,7 @@ Name: kiran-desktop Version: 2.6.0 -Release: 6%{?dist} +Release: 7%{?dist} 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 +# 服务器版本GSetting override Source4: 99_kiran-server.gschema.override # Kiran Mime Apps Source5: kiran-mimeapps.list @@ -83,13 +83,12 @@ Requires: gvfs-gphoto2 Requires: gvfs-mtp Requires: gvfs-smb -%if "%{?ky3_5}" != "" || "%{?openEuler}" != "" +%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != "" Requires: gvfs-fuse3 %else Requires: gvfs-fuse %endif - Requires: mate-desktop Requires: mate-menus @@ -152,7 +151,6 @@ Requires: kiran-calendar >= 2.3 Requires: kiran-icon-theme >= 2.6 Requires: kiran-flameshot Requires: kiran-wallpapers -Requires: kiran-themes Requires: kiran-panel Requires: kiran-panel-libs Requires: kiran-manual @@ -189,15 +187,13 @@ sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/lightdm-kiran-gr sed -i "s/can-suspend=true/can-suspend=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver.ini sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver.ini ## 禁用控制中心前后端的电源插件 -sed -i "/\[power\]/,/Available=true/s/Available=true/Available=false/g" %{_libdir}/kiran-cc-daemon/session/plugin_options +sed -i "/\[power\]/,/Available=true/s/Available=true/Available=false/g" %{_libdir}/kiran-cc-daemon/session/plugin_options 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 || : @@ -212,13 +208,16 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif - %changelog +* 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) + * Wed Mar 27 2024 liuxinhao - 2.6.0-6 -- KYOS-F: set Summer as the default icon theme for server(#31786) +- KYOS-F: set Summer as the default icon theme for server(#31786) * Wed Mar 27 2024 liuxinhao - 2.6.0-5 -- KYOS-F: Disable power management for server versions(#31787) +- KYOS-F: Disable power management for server versions(#31787) * Tue Mar 05 2024 luoqing - 2.6.0-4.kb1 - KYOS-F: change the default location of the popup notification to the top right (#30919)