!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

kiran-desktop.spec

@@ -1,13 +1,19 @@
 %define debug_package %{nil}
-%if %{defined ks_installclass} && "%{ks_installclass}" == "Server"
+%if ("%{?kylin}" != "") || ("%{?kylinsec}" != "")
-%define os_type Server
+    %define kiran_for_openeuler 0
+    %if %{defined ks_installclass} && "%{ks_installclass}" == "Server"
+        %define kylinsec_server 1
+    %else
+        %define kylinsec_server 0
+    %endif
 %else
-%define os_type Desktop
+    %define kiran_for_openeuler 1
 %endif
 
+
 Name:    kiran-desktop
 Version: 2.6.0
-Release: 8
+Release: 10
 Summary: Kiran desktop environment
 #Group:
 License: MulanPSL-2.0
@@ -25,7 +31,7 @@ Source4: 99_kiran-server.gschema.override
 # Kiran Mime Apps
 Source5: kiran-mimeapps.list
 
-%if    "%{?kylin}" != "" || "%{?kylinsec}" != ""
+%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
@@ -154,8 +160,10 @@ 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
@@ -171,7 +179,7 @@ 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
-%if "%{os_type}" == "Server"
+%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
@@ -181,7 +189,8 @@ install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.
 
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
-%if "%{os_type}" == "Server"
+
+%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
@@ -206,13 +215,19 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
 %{_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
-%if "%{os_type}" == "Server"
+%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)
 

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
+x-scheme-handler/network=caja-folder-handler.desktop
+
+[Added Associations]
+application/x-zerosize=pluma.desktop