!86 Update kiran-mimeapps.list to adapt to the new default opening method for blank files (#35528 )

From: @liubuguiii Reviewed-by: @stonefly128 Signed-off-by: @stonefly128
remove kiran-manual dependency in kylinsec release version(#35119 )
2024-04-19 06:43:25 +00:00 · 2024-04-19 11:54:46 +08:00 · 2024-04-19 11:54:37 +08:00 · 2024-04-10 01:56:56 +00:00 · 2024-04-09 15:58:17 +08:00 · 2024-04-07 17:17:39 +08:00
10 changed files with 241 additions and 148 deletions
--- a/90_kiran-gc.gschema.override
+++ b/90_kiran-gc.gschema.override
@ -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
--- a/99-disable-xorg-dpms.conf
+++ b/99-disable-xorg-dpms.conf
@ -0,0 +1,2 @@
+[Seat:*]
+xserver-command=X -core -noreset -dpms -s 0
--- a/99_kiran-org-mate-NotificationDaemon.gschema.override
+++ b/99_kiran-org-mate-NotificationDaemon.gschema.override
@ -0,0 +1,2 @@
+[org.mate.NotificationDaemon]
+popup-location='top_right'
--- a/99_kiran-server.gschema.override
+++ b/99_kiran-server.gschema.override
@ -0,0 +1,10 @@
+[com.kylinsec.kiran.startmenu.lockdown]
+disable-suspend=true
+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
--- a/99_unikylin-mate-application-calculator.gschema.override
+++ b/99_unikylin-mate-application-calculator.gschema.override
@ -1,3 +0,0 @@
-[org.mate.applications-calculator]
-exec='kiran-calculator'
-
--- a/kiran-desktop-2.5.1.tar.gz
+++ b/kiran-desktop-2.5.1.tar.gz
--- a/kiran-desktop-2.6.0.tar.gz
+++ b/kiran-desktop-2.6.0.tar.gz
--- a/kiran-desktop.spec
+++ b/kiran-desktop.spec
@ -1,144 +1,170 @@
 %define debug_package %{nil}
-Name:		kiran-desktop
-Version:	2.5.1
-Release:	2
-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
+%if ("%{?kylin}" != "") || ("%{?kylinsec}" != "")
+    %define kiran_for_openeuler 0
+    %if %{defined ks_installclass} && "%{ks_installclass}" == "Server"
+        %define kylinsec_server 1
+    %else
+        %define kylinsec_server 0
+    %endif
 %else
-Requires:	gvfs-fuse3
-Requires:	mate-notification-daemon
-Requires:	mate-media
-Requires:	caja
-Requires:	caja-open-terminal
-Requires:	fcitx
-Requires:	gtk3
-Requires:	mate-screenshot
+    %define kiran_for_openeuler 1
 %endif

-%ifnarch	loongarch64 sw_64
-Requires:	firefox
+
+Name:    kiran-desktop
+Version: 2.6.0
+Release: 10
+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 Mime Apps
+Source5: 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: 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
+Requires: caja
+Requires: caja-open-terminal
+Requires: fcitx
+Requires: gtk3
+Requires: mate-screenshot
 %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
+%ifnarch  loongarch64 sw_64
+Requires: firefox
+%endif

-Requires:	lightdm
-Requires:	lightdm-gobject
+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:	NetworkManager
-Requires:	NetworkManager-adsl
-Requires:	NetworkManager-ovs
-Requires:	NetworkManager-ppp
-Requires:	NetworkManager-team
-Requires:	NetworkManager-wwan
-Requires:	nm-connection-editor
+Requires: lightdm
+Requires: lightdm-gobject

-Requires:	adwaita-gtk2-theme
-Requires:	google-noto-cjk-fonts
+Requires: NetworkManager
+Requires: NetworkManager-adsl
+Requires: NetworkManager-ovs
+Requires: NetworkManager-ppp
+Requires: NetworkManager-team
+Requires: NetworkManager-wwan
+Requires: nm-connection-editor

-Requires:	alsa-plugins-pulseaudio
-Requires:	dconf
-Requires:	dconf-editor
-Requires:	flatpak
+Requires: adwaita-gtk2-theme
+Requires: google-noto-cjk-fonts

-Requires:	gvfs
-Requires:	gvfs-afc
-Requires:	gvfs-afp
-Requires:	gvfs-archive
-Requires:	gvfs-gphoto2
-Requires:	gvfs-mtp
-Requires:	gvfs-smb
+Requires: alsa-plugins-pulseaudio
+Requires: dconf
+Requires: dconf-editor
+Requires: flatpak

-Requires:	mate-desktop
-Requires:	mate-menus
+Requires: gvfs
+Requires: gvfs-afc
+Requires: gvfs-afp
+Requires: gvfs-archive
+Requires: gvfs-gphoto2
+Requires: gvfs-mtp
+Requires: gvfs-smb

-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
+%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != ""
+Requires: gvfs-fuse3
+%else
+Requires: gvfs-fuse
+%endif

-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: mate-desktop
+Requires: mate-menus

-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
+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

-Obsoletes:	kiran-cpanel-menu
+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-panel
+Requires: kiran-panel-libs
+%if "%{kiran_for_openeuler}" == "1"
+## 内部版本由于帮助手册相较于用户手册不全，暂时去掉kiran帮助手册用用户手册
+Requires: kiran-manual
+%endif
+Obsoletes: kiran-cpanel-menu

 %description
 Kiran desktop environment
@ -151,20 +177,35 @@ 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 "%{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
 %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 "%{kylinsec_server}" == "1"
+## 禁用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,13 +214,57 @@ 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 "%{kylinsec_server}" == "1"
+%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf
+%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override
 %endif

+
 %changelog
+* Fri Apr 19 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-10
+- remove kiran-manual dependency in kylinsec release version(#35119)
+
+* Wed Apr 17 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-9
+- KYOS-B: Update kiran-mimeapps.list to adapt to the new default opening method for blank files (#35528)
+
+* Tue Apr 09 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-8
+- KYOS-F: set idle lock to false by default in the server version (#31787)
+
+* Sun Apr 07 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 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 <liuxinhao@kylinsec.com.cn> - 2.6.0-6
+- KYOS-F: set Summer as the default icon theme for server(#31786)
+
+* Wed Mar 27 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-5.kb1
+- rebuild for 3.5.2
+
+* Wed Mar 27 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-5
+- KYOS-F: Disable power management for server versions(#31787)
+
+* Tue Mar 05 2024 luoqing <liuxinhao@kylinsec.com.cn> - 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 <liuxinhao@kylinsec.com.cn> - 2.6.0-3.kb2
+- KYOS-B: adapt to kylinsec marcos
+
+* Fri Jan 19 2024 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-3.kb1
+- KYOS-B: fix issue of failed pull dependency gvfs-fuse
+
+* Thu Jan 18 2024 luoqing <luoqing@kylinsec.com.cn> - 2.6.0-2.kb1
+- KYOS-F: update some dependent component version to 2.6
+
+* Mon Dec 18 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.6.0-1.kb1
+- KYOS-F: release 2.6.0
+
+* Wed Dec 06 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-2.kb5
+- KYBD: rebuild for KiranUI-2.6-next
+
+* Wed Sep 13 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-2.kb1
+- KYBD: rebuild for KiranUI-2.5-next
+
 * Wed Sep 13 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-2
 - KYBD: remove Require dejavu-fonts

--- a/kiran-desktop.yaml
+++ b/kiran-desktop.yaml
@ -1,4 +1,4 @@
 version_control: gitee
-src_repo: https://gitee.com/openeuler/kiran-desktop.git
-tag_prefix: "v"
-seperator: "."
+src_repo: openeuler/kiran-desktop
+tag_prefix: "^v"
+separator: "."
--- a/kiran-mimeapps.list
+++ b/kiran-mimeapps.list
@ -97,7 +97,11 @@ application/x-archive=engrampa.desktop
 application/vnd.ms-cab-compressed=engrampa.desktop

 text/plain=pluma.desktop
+application/x-zerosize=pluma.desktop

 inode/directory=caja-folder-handler.desktop
 x-scheme-handler/computer=caja-folder-handler.desktop
 x-scheme-handler/network=caja-folder-handler.desktop
+
+[Added Associations]
+application/x-zerosize=pluma.desktop
Author	SHA1	Message	Date
openeuler-ci-bot	56eeb34651	!86 Update kiran-mimeapps.list to adapt to the new default opening method for blank files (#35528 ) From: @liubuguiii Reviewed-by: @stonefly128 Signed-off-by: @stonefly128	2024-04-19 06:43:25 +00:00
liuxinhao	4883cb774c	remove kiran-manual dependency in kylinsec release version(#35119 )	2024-04-19 11:54:46 +08:00
liuxinhao	6400cd7c3c	Update kiran-mimeapps.list to adapt to the new default opening method for blank files (#35528 )	2024-04-19 11:54:37 +08:00
openeuler-ci-bot	4d7663357a	!80 更新服务器版本桌面配置 From: @liubuguiii Reviewed-by: @tangjie02 Signed-off-by: @tangjie02	2024-04-10 01:56:56 +00:00
liuxinhao	e943a6b558	set idle lock to false by default in the server version (#31787 )	2024-04-09 15:58:17 +08:00
liuxinhao	8157f2bd60	kylinsec-server set default theme to kiran-dark,kylinsec-server set default theme to kiran-dark	2024-04-07 17:17:39 +08:00
liuxinhao	5e4c2aa07e	set Summer as the default icon theme for server	2024-03-27 14:28:26 +08:00
liuxinhao	e72ab4a182	Disable power management for server versions(#31787 )	2024-03-27 10:27:48 +08:00
openeuler-ci-bot	1d9c850780	!73 【轻量级 PR】：update kiran-desktop.yaml. From: @licihua Reviewed-by: @tangjie02 Signed-off-by: @tangjie02	2024-01-05 07:21:10 +00:00
Monday	b16667cc7c	update kiran-desktop.yaml. #https://gitee.com/openeuler/openEuler-Advisor/issues/I8T5SR?from=project-issue Signed-off-by: Monday <licihua@huawei.com>	2024-01-04 08:45:26 +00:00