!32 update code to 2.3-4 from master

From: @yuan__xing 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02

99_unikylin-mate-marco-general-theme.gschema.override

@@ -0,0 +1,2 @@
+[org.mate.Marco.general]
+theme='Kiran-dark'

kiran-desktop.spec

@@ -1,14 +1,18 @@
 %define debug_package %{nil}
 
 Name:		kiran-desktop	
-Version:	2.2
-Release:	10
+Version:	2.3
+Release:	4
 Summary:	Kiran desktop environment
 
 #Group:		
-License:	Mulan PSL v2
+License:	MulanPSL-2.0
 #URL:		
 Source0:	%{name}-%{version}.tar.gz
+
+# mate specific settings
+Source1:        99_unikylin-mate-marco-general-theme.gschema.override
+
 BuildArch:	noarch
 
 #BuildRequires:	
@@ -23,6 +27,7 @@ Requires:	alsa-plugins-pulseaudio
 Requires:       caja >= 1.22.0-1%{?dist}.kb36
 %else
 Requires:	caja
+Requires:	caja-open-terminal
 %endif
 Requires:	dconf	
 Requires:	flatpak
@@ -46,7 +51,6 @@ Requires:	libmateweather
 Requires:	libsecret
 Requires:	lm_sensors
 Requires:	marco
-Requires:	mate-control-center
 Requires:	mate-desktop
 Requires:	mate-menus
 %if 0%{?kylin}
@@ -74,11 +78,10 @@ Requires:	lightdm
 Requires:	lightdm-gobject
 Requires:	mate-menus-preferences-category-menu
 Requires:	mate-terminal
+Requires:	mate-polkit
 %if 0%{?kylin}
-Requires:       network-manager-applet >= 1.18.0-2%{?dist}.kb6
 Requires:       mate-media >= 1.22.1-1%{?dist}.kb8
 %else
-Requires:	network-manager-applet 
 Requires:	mate-media 
 %endif
 Requires:	pluma
@@ -91,6 +94,7 @@ Requires:       fcitx >= 4.2.9.6-4%{?dist}.kb10
 %else
 Requires:	fcitx
 %endif
+Requires:	fcitx-configtool
 
 Requires:	glx-utils
 Requires:	initial-setup-gui
@@ -114,30 +118,17 @@ Requires:	kiran-wallpapers
 Requires:	kiran-gtk-theme >= 2.2.1
 Requires:	kiran-icon-theme >= 0.8.0-6
 Requires:	kiran-themes
-Requires:	kiran-log-gtk3 >= 2.1
-Requires:       kiran-log-qt5 >= 2.1
-Requires:	kiran-widgets-qt5 >= 2.2
-Requires:	kiran-session-manager >= 2.2
-Requires:	kiran-control-panel >= 2.1 
-Requires:       kiran-cpanel-launcher >= 2.1 
-Requires:	kiran-cpanel-timedate >= 2.1 
-Requires:	kiran-cpanel-account >= 2.1 
-%if 0%{?kylin}
-Requires:      kiran-cpanel-system >= 2.2 
-%else
-#Requires:       kiran-cpanel-system >= 2.2
-%endif
-Requires:	kiran-cpanel-mouse >= 2.2 
-Requires:	kiran-cpanel-power >= 2.2
-Requires:	kiran-cpanel-display >= 2.1
-Requires:	kiran-cpanel-keyboard >= 2.2
-Requires:	kiran-cpanel-keybinding >= 2.2
-Requires:	kiran-cpanel-appearance >= 2.2
-Requires:	kiran-cc-daemon-common >= 2.2.1
-Requires:       kiran-session-daemon >= 2.2.1
-Requires:       kiran-system-daemon >= 2.2.1
-Requires:	kiran-screensaver-dialog >= 2.2.1
-Requires:	lightdm-kiran-greeter >= 2.2.1
+Requires:	kiran-log-gtk3 >= 2.2
+Requires:       kiran-log-qt5 >= 2.2
+Requires:	kiran-widgets-qt5 >= 2.3
+Requires:	kiran-session-manager >= 2.3
+Requires:	kiran-control-panel >= 2.3 
+Requires:       kiran-cpanel-launcher >= 2.3 
+Requires:	kiran-cc-daemon-common >= 2.3
+Requires:       kiran-session-daemon >= 2.3
+Requires:       kiran-system-daemon >= 2.3
+Requires:	kiran-screensaver-dialog >= 2.3
+Requires:	lightdm-kiran-greeter >= 2.3
 Requires:	kiran-screensaver >= 2.2.0-5
 Requires:	kiran-panel
 Requires:       kiran-panel-libs 
@@ -168,12 +159,31 @@ Kiran desktop environment
 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
+
 %files
 %dir %{_datadir}/doc/%{name}
 %{_datadir}/doc/%{name}/RELEASE.md
+%{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override
 
 
 %changelog
+* Mon Aug 22 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3-4
+- KYOS-F: add depenency: caja-open-terminal
+
+* Mon Aug 08 2022 luoqing <luoqing@kylinsec.com.cn> - 2.3-3
+- KYOS-F: Modify license.
+- KYOS-F: Add yaml file.
+
+* Mon Jul 25 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3-2
+- KYOS-F: add depenency: mate-polkit,fcitx-configtool
+
+* Mon Jul 11 2022 liuxinhao <liuxinhao@Kylinsec.com.cn> - 2.3-1
+- KYOS-F: RELEASE kiran-desktop 2.3
+
+* Wed Jun 29 2022 yuanxing <yuanxing@kylinos.com.cn> - 2.2-11
+- KYOS-F: change the default marco theme to Kiran-dark
+
 * Tue Mar 15 2022 longcheng <longcheng@kylinos.com.cn> - 2.2-10
 - KYOS-B: fix spec error
 

kiran-desktop.yaml

@@ -0,0 +1,4 @@
+version_control: gitee
+src_repo: https://gitee.com/openeuler/kiran-desktop.git
+tag_prefix: "v"
+seperator: "."