From d0663e4c2efc3c5e4f04a9f711c95d8ca3541d15 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Tue, 24 Jun 2025 11:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B1=8F=E4=BF=9D=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=94=81=E5=B1=8F=EF=BC=8C=E6=A1=8C=E9=9D=A2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=BB=98=E8=AE=A4=E7=99=BD=E8=89=B2=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 50_kiran-common.gschema.override | 5 +- 51_kiran-desktop.gschema.override | 7 +++ 51_kiran-server.gschema.override | 8 ++- kiran-desktop.spec | 90 ++++++++++++++++++++++++------- 4 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 51_kiran-desktop.gschema.override diff --git a/50_kiran-common.gschema.override b/50_kiran-common.gschema.override index e1375b4..81ad84a 100644 --- a/50_kiran-common.gschema.override +++ b/50_kiran-common.gschema.override @@ -1,9 +1,6 @@ [org.mate.NotificationDaemon] popup-location='top_right' -[org.mate.Marco.general] -theme='Kiran' - [org.mate.Marco.keybinding-commands] command-window-screenshot='kiran-flameshot gui' @@ -11,4 +8,4 @@ command-window-screenshot='kiran-flameshot gui' run-command-window-screenshot='A' [com.kylinsec.kiran.screensaver] -split-screensaver-and-lock=true +split-screensaver-and-lock=false diff --git a/51_kiran-desktop.gschema.override b/51_kiran-desktop.gschema.override new file mode 100644 index 0000000..43fa041 --- /dev/null +++ b/51_kiran-desktop.gschema.override @@ -0,0 +1,7 @@ +[com.kylinsec.kiran.xsettings] +net-icon-theme-name="Summer" +gtk-cursor-theme-name="Kiran" +net-theme-name="Kiran-white" + +[org.mate.Marco.general] +theme='Kiran-white' diff --git a/51_kiran-server.gschema.override b/51_kiran-server.gschema.override index 0ff8351..6cce237 100644 --- a/51_kiran-server.gschema.override +++ b/51_kiran-server.gschema.override @@ -3,5 +3,9 @@ disable-suspend=true disable-hibernate=true [com.kylinsec.kiran.xsettings] -net-icon-theme-name="Summer" -net-theme-name="Kiran-dark" \ No newline at end of file +net-icon-theme-name="Spring" +gtk-cursor-theme-name="Adwaita" +net-theme-name="Kiran-dark" + +[org.mate.Marco.general] +theme='Kiran-dark' diff --git a/kiran-desktop.spec b/kiran-desktop.spec index ab635f2..abc85b6 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -23,7 +23,7 @@ Name: kiran-desktop Version: 2.6.0 -Release: 22%{?dist} +Release: 24%{?dist} Summary: Kiran desktop environment #Group: License: MulanPSL-2.0 @@ -36,8 +36,10 @@ Source1: 50_kiran-common.gschema.override Source2: 51_kiran-server.gschema.override # 服务器版本定制配置，禁用Xorg screensaver以及DPMS，需比lightdm-50-xserver-command.conf优先级高 Source3: 51-disable-xorg-dpms.conf +# Kiran桌面版本特定GSettings override文件 +Source4: 51_kiran-desktop.gschema.override # Kiran Mime Apps -Source4: kiran-mimeapps.list +Source5: kiran-mimeapps.list %if "%{kiran_for_openeuler}" == "0" Requires: mate-notification-daemon >= 1.22.0-1 @@ -146,7 +148,7 @@ 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-control-panel >= 2.6.4 Requires: kiran-cpanel-launcher >= 2.6 Requires: kiran-cc-daemon-common >= 2.6 Requires: kiran-session-daemon >= 2.6 @@ -159,7 +161,7 @@ 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-screensaver >= 2.2.4 Requires: kiran-applets >= 2.6 Requires: kiran-calendar >= 2.3 Requires: kiran-icon-theme >= 2.6 @@ -171,7 +173,11 @@ Requires: kiran-panel-libs ## 内部版本由于帮助手册相较于用户手册不全，暂时去掉kiran帮助手册用用户手册 Requires: kiran-manual %endif -Obsoletes: kiran-cpanel-menu +%if "%{?build_for_v6}" == "1" +Requires: xscreensaver +%endif + +Obsoletes: kiran-cpanel-menu < 2.3 %description Kiran desktop environment @@ -185,13 +191,21 @@ Kiran desktop environment mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ cp %{_builddir}/%{name}-%{version}/RELEASE.md %{buildroot}/%{_datadir}/doc/%{name}/ +#v6版本，拆分屏保以及锁屏 +%if "%{?build_for_v6}" == "1" +sed -i 's/split-screensaver-and-lock=false/split-screensaver-and-lock=true/g' %SOURCE1 +%endif install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override + %if "%{kylinsec_server}" == "1" ## 安装针对服务器版本禁用相应的电源配置 install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf +%else +install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/51_kiran-desktop.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 || : @@ -209,15 +223,12 @@ sed -i '/\[power\]/,/^\[/ s/Available=true/Available=false/' %{_libdir}/kiran-cc fi %endif - %postun /usr/bin/update-desktop-database &> /dev/null || : - %posttrans glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : - %files %dir %{_datadir}/doc/%{name} %{_datadir}/doc/%{name}/RELEASE.md @@ -226,25 +237,66 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %if "%{kylinsec_server}" == "1" %config(noreplace) %{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf %config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override +%else +%config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-desktop.gschema.override %endif - %changelog -* Thu Apr 03 2025 liuxinhao - 2.6.0-22 +* Wed Apr 30 2025 liuxinhao - 2.6.0.24 +- KYOS-B: Enable split screen saver and lock screen only for V6 version + +* Mon Apr 28 2025 tangjie02 - 2.6.0.23 +- KYOS-F: Add 51_kiran-desktop.gschema.override to distinguish desktop and server. + +* Fri Apr 18 2025 liuxinhao - 2.6.0.23 +- KYOS-B: Add package dependencies xscreensaver for V6(#73664) + +* Wed Mar 26 2025 liuxinhao - 2.6.0.22 - KYOS-F: Setting the default white theme for the desktop version - KYOS-F: Override configuration, split screen saver as well as lock screen(#73664) + +* Mon Nov 25 2024 liuxinhao - 2.6.0-21 - KYOS-B: adjusting gvfs dependency judgments for v6 releases + +* Thu Nov 07 2024 liuxinhao - 2.6.0-20 - KYOS-B: Increase Server Version Disable DPMS Configuration Priority(#53822) + +* Wed Oct 30 2024 liuxinhao - 2.6.0-19 +- rebuild for KY3.3-6-PG-KiranUI-2.6 + +* Wed Oct 30 2024 liuxinhao - 2.6.0-19 +- rebuild for KY3.3-6-PG-KiranUI-2.6 + +* Wed Oct 30 2024 liuxinhao - 2.6.0-19 - Change configuration only at installation time + +* Wed Oct 30 2024 liuxinhao - 2.6.0-18 - Fix the issue that executing the post script twice causes the touchpad backend plugin to be disabled + +* Wed Oct 30 2024 liuxinhao - 2.6.0-17 - Specify configuration file %config(noreplace) + +* Wed Oct 30 2024 liuxinhao - 2.6.0-16 - KYOS-B: Fix post stage change unlock box power configuration error report + +* Tue Oct 29 2024 liuxinhao - 2.6.0-15 - KYOS-F: Adjust the default configuration of window screenshot shortcuts to kiran-flameshot - KYOS-B: Decrease override file priority(#52881) + +* Sat Oct 12 2024 liuxinhao - 2.6.0-14 - KYOS-F: adjusting the default configuration of the PG version to the server configuration(#51253) - KYOS-F: server versions enable locking on idle by default + +* Thu Jun 06 2024 liuxinhao - 2.6.0-13 - KYOS-B: fix install error in KY3.3-9 + +* Fri May 31 2024 liuxinhao - 2.6.0-12 +- rebuild for KiranUI-2.6-next + +* Sat May 11 2024 liuxinhao - 2.6.0-12 - KYOS-F: Reserved idle lock screen related configurations for server versions(#31787) + +* Wed Apr 24 2024 guoqinglan - 2.6.0-11 - KYOS-F: remove kiran-authentication-devices-sdk dependency (#35156) * Fri Apr 19 2024 liuxinhao - 2.6.0-10 @@ -263,31 +315,31 @@ 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 +* Wed Mar 27 2024 liuxinhao - 2.6.0-5 - rebuild for 3.5.2 * 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 +* Tue Mar 05 2024 luoqing - 2.6.0-4 - 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 +* Fri Feb 23 2024 liuxinhao - 2.6.0-3 - KYOS-B: adapt to kylinsec marcos -* Fri Jan 19 2024 liuxinhao - 2.6.0-3.kb1 +* Fri Jan 19 2024 liuxinhao - 2.6.0-3 - KYOS-B: fix issue of failed pull dependency gvfs-fuse -* Thu Jan 18 2024 luoqing - 2.6.0-2.kb1 +* Thu Jan 18 2024 luoqing - 2.6.0-2 - KYOS-F: update some dependent component version to 2.6 -* Mon Dec 18 2023 liuxinhao - 2.6.0-1.kb1 +* Mon Dec 18 2023 liuxinhao - 2.6.0-1 - KYOS-F: release 2.6.0 -* Wed Dec 06 2023 liuxinhao - 2.5.1-2.kb5 +* Wed Dec 06 2023 liuxinhao - 2.5.1-2 - KYBD: rebuild for KiranUI-2.6-next -* Wed Sep 13 2023 liuxinhao - 2.5.1-2.kb1 +* Wed Sep 13 2023 liuxinhao - 2.5.1-2 - KYBD: rebuild for KiranUI-2.5-next * Wed Sep 13 2023 liuxinhao - 2.5.1-2 -- Gitee