From d099eed27055e704d5799b2a1cb49a3e56570441 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Thu, 3 Apr 2025 14:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E5=A4=8D=E8=87=B32.?= =?UTF-8?q?6.0-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 50_kiran-common.gschema.override | 14 +++ ...org-dpms.conf => 51-disable-xorg-dpms.conf | 0 ...erride => 51_kiran-server.gschema.override | 5 +- ...g-mate-NotificationDaemon.gschema.override | 2 - ...-mate-marco-general-theme.gschema.override | 2 - kiran-desktop-2.6.0.tar.gz | Bin 6334 -> 6254 bytes kiran-desktop.spec | 87 +++++++++++------- 7 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 50_kiran-common.gschema.override rename 99-disable-xorg-dpms.conf => 51-disable-xorg-dpms.conf (100%) rename 99_kiran-server.gschema.override => 51_kiran-server.gschema.override (61%) delete mode 100644 99_kiran-org-mate-NotificationDaemon.gschema.override delete mode 100644 99_unikylin-mate-marco-general-theme.gschema.override diff --git a/50_kiran-common.gschema.override b/50_kiran-common.gschema.override new file mode 100644 index 0000000..e1375b4 --- /dev/null +++ b/50_kiran-common.gschema.override @@ -0,0 +1,14 @@ +[org.mate.NotificationDaemon] +popup-location='top_right' + +[org.mate.Marco.general] +theme='Kiran' + +[org.mate.Marco.keybinding-commands] +command-window-screenshot='kiran-flameshot gui' + +[org.mate.Marco.global-keybindings] +run-command-window-screenshot='A' + +[com.kylinsec.kiran.screensaver] +split-screensaver-and-lock=true diff --git a/99-disable-xorg-dpms.conf b/51-disable-xorg-dpms.conf similarity index 100% rename from 99-disable-xorg-dpms.conf rename to 51-disable-xorg-dpms.conf diff --git a/99_kiran-server.gschema.override b/51_kiran-server.gschema.override similarity index 61% rename from 99_kiran-server.gschema.override rename to 51_kiran-server.gschema.override index a3ec177..0ff8351 100644 --- a/99_kiran-server.gschema.override +++ b/51_kiran-server.gschema.override @@ -4,7 +4,4 @@ disable-hibernate=true [com.kylinsec.kiran.xsettings] net-icon-theme-name="Summer" -net-theme-name="Kiran-dark" - -[com.kylinsec.kiran.screensaver] -idle-activation-lock=false +net-theme-name="Kiran-dark" \ No newline at end of file diff --git a/99_kiran-org-mate-NotificationDaemon.gschema.override b/99_kiran-org-mate-NotificationDaemon.gschema.override deleted file mode 100644 index b3063bd..0000000 --- a/99_kiran-org-mate-NotificationDaemon.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.mate.NotificationDaemon] -popup-location='top_right' diff --git a/99_unikylin-mate-marco-general-theme.gschema.override b/99_unikylin-mate-marco-general-theme.gschema.override deleted file mode 100644 index 9c5419a..0000000 --- a/99_unikylin-mate-marco-general-theme.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.mate.Marco.general] -theme='Kiran-dark' diff --git a/kiran-desktop-2.6.0.tar.gz b/kiran-desktop-2.6.0.tar.gz index 665a696b7b2ac6a95b37b44a046efc75d4a81552..c64caef5dfcd4a06604e747612b010eb174f0853 100644 GIT binary patch literal 6254 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 YXwjlYixw?fwET7Q3*ELhl>krx06?lfng9R* literal 6334 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 A_W%F@ diff --git a/kiran-desktop.spec b/kiran-desktop.spec index a1202f4..ab635f2 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,46 +1,53 @@ %define debug_package %{nil} + %if ("%{?kylin}" != "") || ("%{?kylinsec}" != "") %define kiran_for_openeuler 0 + %define kylinsec_server 0 %if %{defined ks_installclass} && "%{ks_installclass}" == "Server" %define kylinsec_server 1 - %else - %define kylinsec_server 0 + %endif + %if "%{?ks_custom_name}" == "PG" || "%{?kylin_custom_name}" == "PG" + %define kylinsec_server 1 %endif %else %define kiran_for_openeuler 1 %endif +%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) +%global build_for_35 1 +%endif + +%if (("%{?kylinsec}" != "") && (0%{?ks_major_version} >= 6)) +%global build_for_v6 1 +%endif Name: kiran-desktop Version: 2.6.0 -Release: 10 +Release: 22%{?dist} Summary: Kiran desktop environment #Group: 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-server.gschema.override +# Kiran通用GSettings override文件 +Source1: 50_kiran-common.gschema.override +# Kiran服务器版本特定GSettings override文件 +Source2: 51_kiran-server.gschema.override +# 服务器版本定制配置，禁用Xorg screensaver以及DPMS，需比lightdm-50-xserver-command.conf优先级高 +Source3: 51-disable-xorg-dpms.conf # Kiran Mime Apps -Source5: kiran-mimeapps.list +Source4: kiran-mimeapps.list %if "%{kiran_for_openeuler}" == "0" 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: fcitx >= 4.2.9 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: mate-notification-daemon Requires: mate-media @@ -89,7 +96,7 @@ Requires: gvfs-gphoto2 Requires: gvfs-mtp Requires: gvfs-smb -%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != "" +%if 0%{?build_for_35} || 0%{?build_for_v6} || "%{?openEuler}" != "" Requires: gvfs-fuse3 %else Requires: gvfs-fuse @@ -177,28 +184,29 @@ 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_kiran-org-mate-NotificationDaemon.gschema.override + +install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override %if "%{kylinsec_server}" == "1" ## 安装针对服务器版本禁用相应的电源配置 -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-server.gschema.override +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 %endif -install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list - +install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list %post /usr/bin/update-desktop-database &> /dev/null || : +## 服务器版本默认配置，只在初次安装时修改，避免定制版本配置被覆盖 %if "%{kylinsec_server}" == "1" +if [ "$1" -eq 1 ]; then ## 禁用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 +sed -i "s/can-suspend=true/can-suspend=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver-dialog.ini +sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver-dialog.ini +## 禁用控制中心后端的电源插件 +sed -i '/\[power\]/,/^\[/ s/Available=true/Available=false/' %{_libdir}/kiran-cc-daemon/session/plugin_options +fi %endif @@ -209,19 +217,36 @@ mv %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop %{_ %posttrans glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : + %files %dir %{_datadir}/doc/%{name} %{_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_kiran-org-mate-NotificationDaemon.gschema.override +%config(noreplace) %{_datadir}/applications/kiran-mimeapps.list +%config(noreplace) %{_datadir}/glib-2.0/schemas/50_kiran-common.gschema.override %if "%{kylinsec_server}" == "1" -%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf -%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override +%config(noreplace) %{_datadir}/lightdm/lightdm.conf.d/51-disable-xorg-dpms.conf +%config(noreplace) %{_datadir}/glib-2.0/schemas/51_kiran-server.gschema.override %endif %changelog +* Thu Apr 03 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) +- KYOS-B: adjusting gvfs dependency judgments for v6 releases +- KYOS-B: Increase Server Version Disable DPMS Configuration Priority(#53822) +- Change configuration only at installation time +- Fix the issue that executing the post script twice causes the touchpad backend plugin to be disabled +- Specify configuration file %config(noreplace) +- KYOS-B: Fix post stage change unlock box power configuration error report +- KYOS-F: Adjust the default configuration of window screenshot shortcuts to kiran-flameshot +- KYOS-B: Decrease override file priority(#52881) +- 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 +- KYOS-B: fix install error in KY3.3-9 +- KYOS-F: Reserved idle lock screen related configurations for server versions(#31787) +- KYOS-F: remove kiran-authentication-devices-sdk dependency (#35156) + * Fri Apr 19 2024 liuxinhao - 2.6.0-10 - remove kiran-manual dependency in kylinsec release version(#35119) -- Gitee