From e72ab4a182fd9c13f81ce75260764b7f3205c13f Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Wed, 27 Mar 2024 09:34:03 +0800 Subject: [PATCH 1/4] Disable power management for server versions(#31787) --- 90_kiran-gc.gschema.override | 7 - 99-disable-xorg-dpms.conf | 2 + ...g-mate-NotificationDaemon.gschema.override | 2 + 99_kiran-start-menu-server.gschema.override | 3 + ...te-application-calculator.gschema.override | 3 - kiran-desktop-2.5.1.tar.gz | Bin 6812 -> 0 bytes kiran-desktop-2.6.0.tar.gz | Bin 0 -> 6334 bytes kiran-desktop.spec | 346 ++++++++++-------- 8 files changed, 209 insertions(+), 154 deletions(-) delete mode 100644 90_kiran-gc.gschema.override create mode 100644 99-disable-xorg-dpms.conf create mode 100644 99_kiran-org-mate-NotificationDaemon.gschema.override create mode 100644 99_kiran-start-menu-server.gschema.override delete mode 100644 99_unikylin-mate-application-calculator.gschema.override delete mode 100644 kiran-desktop-2.5.1.tar.gz create mode 100644 kiran-desktop-2.6.0.tar.gz diff --git a/90_kiran-gc.gschema.override b/90_kiran-gc.gschema.override deleted file mode 100644 index 89c7abc..0000000 --- a/90_kiran-gc.gschema.override +++ /dev/null @@ -1,7 +0,0 @@ -[com.kylinsec.kiran.power] -profile-policy='tuned' - -[com.kylinsec.kiran.keyboard] -modifier-lock-enabled=true -capslock-tips-enabled=true -numlock-tips-enabled=true diff --git a/99-disable-xorg-dpms.conf b/99-disable-xorg-dpms.conf new file mode 100644 index 0000000..bb0d3a1 --- /dev/null +++ b/99-disable-xorg-dpms.conf @@ -0,0 +1,2 @@ +[Seat:*] +xserver-command=X -core -noreset -dpms -s 0 diff --git a/99_kiran-org-mate-NotificationDaemon.gschema.override b/99_kiran-org-mate-NotificationDaemon.gschema.override new file mode 100644 index 0000000..b3063bd --- /dev/null +++ b/99_kiran-org-mate-NotificationDaemon.gschema.override @@ -0,0 +1,2 @@ +[org.mate.NotificationDaemon] +popup-location='top_right' diff --git a/99_kiran-start-menu-server.gschema.override b/99_kiran-start-menu-server.gschema.override new file mode 100644 index 0000000..5f4781d --- /dev/null +++ b/99_kiran-start-menu-server.gschema.override @@ -0,0 +1,3 @@ +[com.kylinsec.kiran.startmenu.lockdown] +disable-suspend=true +disable-hibernate=true diff --git a/99_unikylin-mate-application-calculator.gschema.override b/99_unikylin-mate-application-calculator.gschema.override deleted file mode 100644 index 5400493..0000000 --- a/99_unikylin-mate-application-calculator.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.mate.applications-calculator] -exec='kiran-calculator' - diff --git a/kiran-desktop-2.5.1.tar.gz b/kiran-desktop-2.5.1.tar.gz deleted file mode 100644 index 657cbc97018f8a8bfd6293129ccb365b20fece27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6812 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 KjUd$kcmMzkrZYPL diff --git a/kiran-desktop-2.6.0.tar.gz b/kiran-desktop-2.6.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..665a696b7b2ac6a95b37b44a046efc75d4a81552 GIT binary patch literal 6334 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 A_W%F@ literal 0 HcmV?d00001 diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 49b4e3f..2d4fda6 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,144 +1,163 @@ %define debug_package %{nil} -Name: kiran-desktop -Version: 2.5.1 -Release: 2 -Summary: Kiran desktop environment +%if %{defined ks_installclass} && "%{ks_installclass}" == "Server" +%define os_type Server +%else +%define os_type Desktop +%endif + +Name: kiran-desktop +Version: 2.6.0 +Release: 5%{?dist} +Summary: Kiran desktop environment #Group: -License: MulanPSL-2.0 -#URL: -Source0: %{name}-%{version}.tar.gz - -# mate specific settings -Source1: 99_unikylin-mate-marco-general-theme.gschema.override -Source2: 99_unikylin-mate-application-calculator.gschema.override -Source3: 90_kiran-gc.gschema.override -Source4: kiran-mimeapps.list - - -%if "%{?kylin}" != "" -Requires: gvfs-fuse -Requires: mate-notification-daemon >= 1.22.0-1 -Requires: mate-media >= 1.22.1-1 -Requires: caja >= 1.22.0-1 -Requires: fcitx >= 4.2.9.6-4 -Requires: gtk3 >= 3.22.30-4 -Requires: kylin-license-core >= 2.2 -Requires: kylin-license-client >= 2.2 -Requires: kylin-license-tool >= 2.2 +License: MulanPSL-2.0 +URL: https://gitee.com/openeuler/kiran-desktop +Source0: %{name}-%{version}.tar.gz + +# 设置Marco默认主题 +Source1: 99_unikylin-mate-marco-general-theme.gschema.override +# 更改Mate Notification 通知位置 +Source2: 99_kiran-org-mate-NotificationDaemon.gschema.override +# 服务器版本定制配置，禁用Xorg screensaver以及DPMS +Source3: 99-disable-xorg-dpms.conf +# 服务器版本定制配置，禁用开始菜单休眠/待机 +Source4: 99_kiran-start-menu-server.gschema.override +# Kiran Mime Apps +Source5: kiran-mimeapps.list + +%if "%{?kylin}" != "" || "%{?kylinsec}" != "" +Requires: mate-notification-daemon >= 1.22.0-1 +Requires: mate-media >= 1.22.1-1 +Requires: caja >= 1.22.0-1 +Requires: fcitx >= 4.2.9.6-4 +Requires: gtk3 >= 3.22.30-4 +Requires: kylin-license-core >= 2.2 +Requires: kylin-license-client >= 2.2 +Requires: kylin-license-tool >= 2.2 +Requires: kiran-authentication-devices-sdk %else -Requires: gvfs-fuse3 -Requires: mate-notification-daemon -Requires: mate-media -Requires: caja -Requires: caja-open-terminal -Requires: fcitx -Requires: gtk3 -Requires: mate-screenshot +Requires: mate-notification-daemon +Requires: mate-media +Requires: caja +Requires: caja-open-terminal +Requires: fcitx +Requires: gtk3 +Requires: mate-screenshot %endif -%ifnarch loongarch64 sw_64 -Requires: firefox +%ifnarch loongarch64 sw_64 +Requires: firefox +%endif + +Requires: xorg-x11-drivers +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-utils +Requires: xorg-x11-xauth +Requires: xorg-x11-xinit +Requires: mesa-dri-drivers + +Requires: lightdm +Requires: lightdm-gobject + +Requires: NetworkManager +Requires: NetworkManager-adsl +Requires: NetworkManager-ovs +Requires: NetworkManager-ppp +Requires: NetworkManager-team +Requires: NetworkManager-wwan +Requires: nm-connection-editor + +Requires: adwaita-gtk2-theme +Requires: google-noto-cjk-fonts + +Requires: alsa-plugins-pulseaudio +Requires: dconf +Requires: dconf-editor +Requires: flatpak + +Requires: gvfs +Requires: gvfs-afc +Requires: gvfs-afp +Requires: gvfs-archive +Requires: gvfs-gphoto2 +Requires: gvfs-mtp +Requires: gvfs-smb + +%if "%{?ky3_5}" != "" || "%{?openEuler}" != "" +Requires: gvfs-fuse3 +%else +Requires: gvfs-fuse %endif -Requires: xorg-x11-drivers -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-utils -Requires: xorg-x11-xauth -Requires: xorg-x11-xinit -Requires: mesa-dri-drivers - -Requires: lightdm -Requires: lightdm-gobject - -Requires: NetworkManager -Requires: NetworkManager-adsl -Requires: NetworkManager-ovs -Requires: NetworkManager-ppp -Requires: NetworkManager-team -Requires: NetworkManager-wwan -Requires: nm-connection-editor - -Requires: adwaita-gtk2-theme -Requires: google-noto-cjk-fonts - -Requires: alsa-plugins-pulseaudio -Requires: dconf -Requires: dconf-editor -Requires: flatpak - -Requires: gvfs -Requires: gvfs-afc -Requires: gvfs-afp -Requires: gvfs-archive -Requires: gvfs-gphoto2 -Requires: gvfs-mtp -Requires: gvfs-smb - -Requires: mate-desktop -Requires: mate-menus - -Requires: kwin -Requires: marco -Requires: engrampa -Requires: atril -Requires: pluma -Requires: eom -Requires: mate-settings-daemon -Requires: mate-user-guide -Requires: mate-menus-preferences-category-menu -Requires: mate-terminal -Requires: libmatekbd -Requires: libmatemixer -Requires: libmateweather -Requires: yelp -Requires: libsecret -Requires: lm_sensors -Requires: gnome-disk-utility -Requires: firewall-config - -Requires: ntfs-3g -Requires: ntfsprogs -Requires: pavucontrol -Requires: setroubleshoot -Requires: system-config-printer -Requires: fcitx-qt5 -Requires: fcitx-configtool -Requires: glx-utils -Requires: initial-setup-gui -Requires: plymouth-system-theme - -Requires: p7zip -Requires: xdg-user-dirs-gtk -Requires: vim-enhanced -Requires: spice-vdagent - -Requires: kiran-authentication-service >= 2.5 -Requires: kiran-authentication-devices >= 2.5 -Requires: kiran-session-manager >= 2.5 -Requires: kiran-control-panel >= 2.5 -Requires: kiran-cpanel-launcher >= 2.4 -Requires: kiran-cc-daemon-common >= 2.5 -Requires: kiran-session-daemon >= 2.5 -Requires: kiran-system-daemon >= 2.5 -Requires: kiran-log-gtk3 >= 2.4 -Requires: kiran-log-qt5 >= 2.4 -Requires: kiran-widgets-qt5 >= 2.4 -Requires: kiran-calculator >= 2.3 -Requires: kiran-gtk-theme >= 2.3 -Requires: kiran-screensaver-dialog >= 2.5 -Requires: kiran-polkit-agent >= 2.5 -Requires: lightdm-kiran-greeter >= 2.5 -Requires: kiran-screensaver >= 2.2 -Requires: kiran-applets >= 2.2.6-4 -Requires: kiran-calendar >= 2.2 -Requires: kiran-icon-theme >= 2.5 -Requires: kiran-flameshot -Requires: kiran-wallpapers -Requires: kiran-themes -Requires: kiran-panel -Requires: kiran-panel-libs - -Obsoletes: kiran-cpanel-menu + +Requires: mate-desktop +Requires: mate-menus + +Requires: kwin +Requires: marco +Requires: engrampa +Requires: atril +Requires: pluma +Requires: eom +Requires: mate-settings-daemon +Requires: mate-user-guide +Requires: mate-menus-preferences-category-menu +Requires: mate-terminal +Requires: libmatekbd +Requires: libmatemixer +Requires: libmateweather +Requires: yelp +Requires: libsecret +Requires: lm_sensors +Requires: gnome-disk-utility +Requires: firewall-config + +Requires: ntfs-3g +Requires: ntfsprogs +Requires: pavucontrol +Requires: setroubleshoot +Requires: system-config-printer +Requires: fcitx-qt5 +Requires: fcitx-configtool +Requires: glx-utils +Requires: initial-setup-gui +Requires: plymouth-system-theme + +Requires: p7zip +Requires: xdg-user-dirs-gtk +Requires: vim-enhanced +Requires: spice-vdagent +Requires: kf5-kconfig +Requires: libqtxdg + +Requires: kiran-authentication-service >= 2.5 +Requires: kiran-authentication-devices >= 2.5 +Requires: kiran-session-manager >= 2.5 +Requires: kiran-control-panel >= 2.6 +Requires: kiran-cpanel-launcher >= 2.6 +Requires: kiran-cc-daemon-common >= 2.6 +Requires: kiran-session-daemon >= 2.6 +Requires: kiran-system-daemon >= 2.6 +Requires: kiran-log-gtk3 >= 2.4 +Requires: kiran-log-qt5 >= 2.4 +Requires: kiran-widgets-qt5 >= 2.4 +Requires: kiran-calculator >= 2.3 +Requires: kiran-gtk-theme >= 2.6 +Requires: kiran-screensaver-dialog >= 2.5 +Requires: kiran-polkit-agent >= 2.5 +Requires: lightdm-kiran-greeter >= 2.5 +Requires: kiran-screensaver >= 2.2 +Requires: kiran-applets >= 2.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 + +Obsoletes: kiran-cpanel-menu %description Kiran desktop environment @@ -151,20 +170,34 @@ Kiran desktop environment %install mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ cp %{_builddir}/%{name}-%{version}/RELEASE.md %{buildroot}/%{_datadir}/doc/%{name}/ - install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override -install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-application-calculator.gschema.override -%if "%{ks_custom_name}" == "GC" -install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/glib-2.0/schemas/90_kiran-gc.gschema.override +install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override +%if "%{os_type}" == "Server" +## 安装针对服务器版本禁用相应的电源配置 +install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf +install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-start-menu-server.gschema.override %endif -install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list +install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list + %post /usr/bin/update-desktop-database &> /dev/null || : +%if "%{os_type}" == "Server" +## 禁用greeter/screensaver的休眠/待机 +sed -i "s/can-suspend=true/can-suspend=false/g" %{_datadir}/lightdm-kiran-greeter/greeter.ini +sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/lightdm-kiran-greeter/greeter.ini +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 +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 || : @@ -173,18 +206,43 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %{_datadir}/doc/%{name}/RELEASE.md %{_datadir}/applications/kiran-mimeapps.list %{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override -%{_datadir}/glib-2.0/schemas/99_unikylin-mate-application-calculator.gschema.override - -%if "%{ks_custom_name}" == "GC" -%{_datadir}/glib-2.0/schemas/90_kiran-gc.gschema.override +%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override +%if "%{os_type}" == "Server" +%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf +%{_datadir}/glib-2.0/schemas/99_kiran-start-menu-server.gschema.override %endif + %changelog +* Wed Mar 27 2024 liuxinhao - 2.6.0-5 +- 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) + +* Fri Feb 23 2024 liuxinhao - 2.6.0-3.kb2 +- KYOS-B: adapt to kylinsec marcos + +* Fri Jan 19 2024 liuxinhao - 2.6.0-3.kb1 +- KYOS-B: fix issue of failed pull dependency gvfs-fuse + +* Thu Jan 18 2024 luoqing - 2.6.0-2.kb1 +- KYOS-F: update some dependent component version to 2.6 + +* Mon Dec 18 2023 liuxinhao - 2.6.0-1.kb1 +- KYOS-F: release 2.6.0 + +* Wed Dec 06 2023 liuxinhao - 2.5.1-2.kb5 +- KYBD: rebuild for KiranUI-2.6-next + +* Wed Sep 13 2023 liuxinhao - 2.5.1-2.kb1 +- KYBD: rebuild for KiranUI-2.5-next + * Wed Sep 13 2023 liuxinhao - 2.5.1-2 - KYBD: remove Require dejavu-fonts * Tue Jul 25 2023 liuxinhao - 2.5.1-1 -- KYOS-F: add kiran-mimeapps.list file,add require atril(#10298) +- KYOS-F: add kiran-mimeapps.list file,add require atril(#10298) * Mon Jul 10 2023 meizhigang - 2.5.0-10 - KYOS-F: Add kiran gschema override for GC (#9113 #9379) -- Gitee From 5e4c2aa07ebe358c09cd8e8bba404a268f8bcd51 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Wed, 27 Mar 2024 14:21:30 +0800 Subject: [PATCH 2/4] set Summer as the default icon theme for server --- ...ema.override => 99_kiran-server.gschema.override | 3 +++ kiran-desktop.spec | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) rename 99_kiran-start-menu-server.gschema.override => 99_kiran-server.gschema.override (57%) diff --git a/99_kiran-start-menu-server.gschema.override b/99_kiran-server.gschema.override similarity index 57% rename from 99_kiran-start-menu-server.gschema.override rename to 99_kiran-server.gschema.override index 5f4781d..986bd86 100644 --- a/99_kiran-start-menu-server.gschema.override +++ b/99_kiran-server.gschema.override @@ -1,3 +1,6 @@ [com.kylinsec.kiran.startmenu.lockdown] disable-suspend=true disable-hibernate=true + +[com.kylinsec.kiran.xsettings] +net-icon-theme-name="Summer" diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 2d4fda6..445f685 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -7,7 +7,7 @@ Name: kiran-desktop Version: 2.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Kiran desktop environment #Group: License: MulanPSL-2.0 @@ -20,8 +20,8 @@ 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 -# 服务器版本定制配置，禁用开始菜单休眠/待机 -Source4: 99_kiran-start-menu-server.gschema.override +# 服务器版本GSetting override +Source4: 99_kiran-server.gschema.override # Kiran Mime Apps Source5: kiran-mimeapps.list @@ -175,7 +175,7 @@ install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-or %if "%{os_type}" == "Server" ## 安装针对服务器版本禁用相应的电源配置 install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf -install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-start-menu-server.gschema.override +install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list @@ -209,11 +209,14 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override %if "%{os_type}" == "Server" %{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf -%{_datadir}/glib-2.0/schemas/99_kiran-start-menu-server.gschema.override +%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif %changelog +* 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 - KYOS-F: Disable power management for server versions(#31787) -- Gitee From 8157f2bd60e8621c80c08ad2f767374d4f6f041b Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Sun, 7 Apr 2024 17:17:39 +0800 Subject: [PATCH 3/4] 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) -- Gitee From e943a6b558e5707a80f2b798236bd54250c70be4 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Tue, 9 Apr 2024 15:58:17 +0800 Subject: [PATCH 4/4] set idle lock to false by default in the server version (#31787) --- 99_kiran-server.gschema.override | 5 ++++- kiran-desktop.spec | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) 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) -- Gitee