!80 更新服务器版本桌面配置
From: @liubuguiii Reviewed-by: @tangjie02 Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot
Gitee
commit
4d7663357a
@ -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
|
||||
2
99-disable-xorg-dpms.conf
Normal file
2
99-disable-xorg-dpms.conf
Normal file
@ -0,0 +1,2 @@
|
||||
[Seat:*]
|
||||
xserver-command=X -core -noreset -dpms -s 0
|
||||
2
99_kiran-org-mate-NotificationDaemon.gschema.override
Normal file
2
99_kiran-org-mate-NotificationDaemon.gschema.override
Normal file
@ -0,0 +1,2 @@
|
||||
[org.mate.NotificationDaemon]
|
||||
popup-location='top_right'
|
||||
10
99_kiran-server.gschema.override
Normal file
10
99_kiran-server.gschema.override
Normal file
@ -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
|
||||
@ -1,3 +0,0 @@
|
||||
[org.mate.applications-calculator]
|
||||
exec='kiran-calculator'
|
||||
|
||||
Binary file not shown.
BIN
kiran-desktop-2.6.0.tar.gz
Normal file
BIN
kiran-desktop-2.6.0.tar.gz
Normal file
Binary file not shown.
@ -1,22 +1,31 @@
|
||||
%define debug_package %{nil}
|
||||
%if %{defined ks_installclass} && "%{ks_installclass}" == "Server"
|
||||
%define os_type Server
|
||||
%else
|
||||
%define os_type Desktop
|
||||
%endif
|
||||
|
||||
Name: kiran-desktop
|
||||
Version: 2.5.1
|
||||
Release: 2
|
||||
Version: 2.6.0
|
||||
Release: 8
|
||||
Summary: Kiran desktop environment
|
||||
#Group:
|
||||
License: MulanPSL-2.0
|
||||
#URL:
|
||||
URL: https://gitee.com/openeuler/kiran-desktop
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
# mate specific settings
|
||||
# 设置Marco默认主题
|
||||
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
|
||||
# 更改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 "%{?kylin}" != ""
|
||||
Requires: gvfs-fuse
|
||||
%if "%{?kylin}" != "" || "%{?kylinsec}" != ""
|
||||
Requires: mate-notification-daemon >= 1.22.0-1
|
||||
Requires: mate-media >= 1.22.1-1
|
||||
Requires: caja >= 1.22.0-1
|
||||
@ -25,8 +34,8 @@ 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: gvfs-fuse3
|
||||
Requires: mate-notification-daemon
|
||||
Requires: mate-media
|
||||
Requires: caja
|
||||
@ -74,6 +83,13 @@ Requires: gvfs-gphoto2
|
||||
Requires: gvfs-mtp
|
||||
Requires: gvfs-smb
|
||||
|
||||
%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != ""
|
||||
Requires: gvfs-fuse3
|
||||
%else
|
||||
Requires: gvfs-fuse
|
||||
%endif
|
||||
|
||||
|
||||
Requires: mate-desktop
|
||||
Requires: mate-menus
|
||||
|
||||
@ -111,32 +127,34 @@ 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.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-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.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.2.6-4
|
||||
Requires: kiran-calendar >= 2.2
|
||||
Requires: kiran-icon-theme >= 2.5
|
||||
Requires: kiran-applets >= 2.6
|
||||
Requires: kiran-calendar >= 2.3
|
||||
Requires: kiran-icon-theme >= 2.6
|
||||
Requires: kiran-flameshot
|
||||
Requires: kiran-wallpapers
|
||||
Requires: kiran-themes
|
||||
Requires: kiran-panel
|
||||
Requires: kiran-panel-libs
|
||||
Requires: kiran-manual
|
||||
|
||||
Obsoletes: kiran-cpanel-menu
|
||||
|
||||
@ -151,20 +169,34 @@ 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 "%{os_type}" == "Server"
|
||||
## 安装针对服务器版本禁用相应的电源配置
|
||||
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 "%{os_type}" == "Server"
|
||||
## 禁用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 +205,51 @@ 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 "%{os_type}" == "Server"
|
||||
%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf
|
||||
%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user