添加依赖: firefox,eom,dejavu-fonts

kiran-desktop.spec

@@ -2,37 +2,52 @@
 
 Name:		kiran-desktop	
 Version:	2.4
-Release:	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
+Source1:    99_unikylin-mate-marco-general-theme.gschema.override
 
 BuildArch:	noarch
 
-#BuildRequires:	
+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
+
+%if 0%{?kylin}
+Requires:       gtk3 >= 3.22.30-4%{?dist}.kb6
+%else
+Requires:       gtk3 
+%endif
+
+Requires:	lightdm
+Requires:	lightdm-gobject
+
+Requires:	NetworkManager
 Requires:	NetworkManager-adsl
 Requires:	NetworkManager-ovs
 Requires:	NetworkManager-ppp
 Requires:	NetworkManager-team
 Requires:	NetworkManager-wwan
+Requires:	nm-connection-editor
+
 Requires:	adwaita-gtk2-theme
-Requires:	alsa-plugins-pulseaudio
-%if 0%{?kylin}
-Requires:       caja >= 1.22.0-1%{?dist}.kb36
-%else
-Requires:	caja
-Requires:	caja-open-terminal
-%endif
-Requires:	dconf	
-Requires:	flatpak
-Requires:	gnome-disk-utility
 Requires:	google-noto-cjk-fonts
+Requires:   dejavu-fonts
+
+Requires:	alsa-plugins-pulseaudio
+Requires:	dconf
+Requires:	dconf-editor
+Requires:	flatpak
+
 Requires:	gvfs
 Requires:	gvfs-afc
 Requires:	gvfs-afp
@@ -40,17 +55,12 @@ Requires:	gvfs-archive
 %if 0%{?kylin}
 Requires:	gvfs-fuse
 %else
-Requires:       gvfs-fuse3
+Requires:   gvfs-fuse3
 %endif
 Requires:	gvfs-gphoto2
 Requires:	gvfs-mtp
 Requires:	gvfs-smb
-Requires:	libmatekbd
+
-Requires:	libmatemixer
-Requires:	libmateweather
-Requires:	libsecret
-Requires:	lm_sensors
-Requires:	marco
 Requires:	mate-desktop
 Requires:	mate-menus
 %if 0%{?kylin}
@@ -58,82 +68,80 @@ Requires: 	mate-notification-daemon >= 1.22.0-1%{?dist}.kb7
 %else
 Requires:	mate-notification-daemon
 %endif
-Requires:	mate-settings-daemon
-Requires:	mate-user-guide
-Requires:	nm-connection-editor
-Requires:	ntfs-3g
-Requires:	ntfsprogs
-Requires:	p7zip
-Requires:	pavucontrol
-Requires:	xdg-user-dirs-gtk
-Requires:	yelp
-Requires:	NetworkManager
-Requires:	dconf-editor
-Requires:	engrampa
-%ifarch x86_64 aarch64 
-Requires:	 firefox 
-%endif
-Requires:	firewall-config
-Requires:	lightdm
-Requires:	lightdm-gobject
-Requires:	mate-menus-preferences-category-menu
-Requires:	mate-terminal
-Requires:	mate-polkit
 %if 0%{?kylin}
 Requires:       mate-media >= 1.22.1-1%{?dist}.kb8
 %else
 Requires:	mate-media 
 %endif
+%if 0%{?kylin}
+Requires:   caja >= 1.22.0-1%{?dist}.kb36
+%else
+Requires:	caja
+Requires:	caja-open-terminal
+%endif
+Requires:	marco
+Requires:	engrampa
 Requires:	pluma
+Requires:   eom
+Requires:	mate-settings-daemon
+Requires:	mate-user-guide
+Requires:	mate-menus-preferences-category-menu
+Requires:	mate-terminal
+Requires:	mate-polkit
+Requires:	libmatekbd
+Requires:	libmatemixer
+Requires:	libmateweather
+Requires:	yelp
+Requires:	libsecret
+Requires:	lm_sensors
+Requires:	gnome-disk-utility
+Requires:	firewall-config
+Requires:	firefox
+
+Requires:	ntfs-3g
+Requires:	ntfsprogs
+Requires:	pavucontrol
 Requires:	setroubleshoot
 Requires:	system-config-printer
-Requires:	vim-enhanced
-Requires:	initial-setup-gui
 %if 0%{?kylin}
-Requires:       fcitx >= 4.2.9.6-4%{?dist}.kb10
+Requires:   fcitx >= 4.2.9.6-4%{?dist}.kb10
 %else
 Requires:	fcitx
 %endif
+Requires:   fcitx-qt5
 Requires:	fcitx-configtool
-
 Requires:	glx-utils
 Requires:	initial-setup-gui
-Requires:	mesa-dri-drivers
 Requires:	plymouth-system-theme
-Requires:	spice-vdagent
-Requires:	xorg-x11-drivers
-Requires:	xorg-x11-server-Xorg
-Requires:	xorg-x11-utils
-Requires:	xorg-x11-xauth
-Requires:	xorg-x11-xinit
-%if 0%{?kylin}
-Requires:       gtk3 >= 3.22.30-4%{?dist}.kb6
-%else
-Requires:       gtk3 
-%endif
 
-Requires:	kiran-calculator >= 2.3
+Requires:	p7zip
-Requires:	kiran-flameshot 
+Requires:	xdg-user-dirs-gtk
-Requires:	kiran-wallpapers
+Requires:	vim-enhanced
-Requires:	kiran-gtk-theme >= 2.3
+Requires:	spice-vdagent
-Requires:	kiran-icon-theme >= 0.8.0-6
+
-Requires:	kiran-themes
+Requires:	kiran-session-manager >= 2.4
+Requires:	kiran-control-panel >= 2.4 
+Requires:   kiran-cpanel-launcher >= 2.4 
+Requires:   kiran-cc-daemon-common >= 2.4
+Requires:   kiran-session-daemon >= 2.4
+Requires:   kiran-system-daemon >= 2.4
 Requires:	kiran-log-gtk3 >= 2.4
 Requires:   kiran-log-qt5 >= 2.4
 Requires:	kiran-widgets-qt5 >= 2.4
-Requires:	kiran-session-manager >= 2.3
+Requires:	kiran-calculator >= 2.3
-Requires:	kiran-control-panel >= 2.4 
+Requires:	kiran-gtk-theme >= 2.3
-Requires:   kiran-cpanel-launcher >= 2.4 
-Requires:	kiran-cc-daemon-common >= 2.4
-Requires:   kiran-session-daemon >= 2.4
-Requires:   kiran-system-daemon >= 2.4
 Requires:	kiran-screensaver-dialog >= 2.3
 Requires:	lightdm-kiran-greeter >= 2.3
 Requires:	kiran-screensaver >= 2.2
-Requires:	kiran-panel
-Requires:       kiran-panel-libs 
 Requires:	kiran-applets >= 2.2.6-4
 Requires:	kiran-calendar >= 2.2
+Requires:	kiran-icon-theme >= 0.8.0-6
+Requires:	kiran-flameshot 
+Requires:	kiran-wallpapers
+Requires:	kiran-themes
+Requires:	kiran-panel
+Requires:   kiran-panel-libs 
+
 %if 0%{?kylin}
 Requires:	kylin-license-core >= 2.2
 Requires:	kylin-license-client >= 2.2 
@@ -144,7 +152,6 @@ Requires:	kylin-license-tool >= 2.2
 #Requires:      kylin-license-tool >= 2.2
 %endif
 
-Requires:       fcitx-qt5
 Obsoletes: 	kiran-cpanel-menu
 
 %description
@@ -168,6 +175,9 @@ install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin
 
 
 %changelog
+* Mon Nov 14 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4-2
+- KYOS-F: add Requres: firefox,eom,dejavu-fonts
+
 * Fri Nov 04 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4-1
 - KYOS-F: RELEASE kiran-desktop 2.4