Compare commits

..

No commits in common. "56eeb34651455e10ad8829d0b567e59f901ab3a4" and "b0725250645d1f934eb1ba4f4bbb80c5fe1bcd2d" have entirely different histories.

10 changed files with 146 additions and 239 deletions

View File

@ -0,0 +1,7 @@
[com.kylinsec.kiran.power]
profile-policy='tuned'
[com.kylinsec.kiran.keyboard]
modifier-lock-enabled=true
capslock-tips-enabled=true
numlock-tips-enabled=true

View File

@ -1,2 +0,0 @@
[Seat:*]
xserver-command=X -core -noreset -dpms -s 0

View File

@ -1,2 +0,0 @@
[org.mate.NotificationDaemon]
popup-location='top_right'

View File

@ -1,10 +0,0 @@
[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

View File

@ -0,0 +1,3 @@
[org.mate.applications-calculator]
exec='kiran-calculator'

BIN
kiran-desktop-2.5.1.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,170 +1,144 @@
%define debug_package %{nil} %define debug_package %{nil}
%if ("%{?kylin}" != "") || ("%{?kylinsec}" != "") Name: kiran-desktop
%define kiran_for_openeuler 0 Version: 2.5.1
%if %{defined ks_installclass} && "%{ks_installclass}" == "Server" Release: 2
%define kylinsec_server 1 Summary: Kiran desktop environment
%else
%define kylinsec_server 0
%endif
%else
%define kiran_for_openeuler 1
%endif
Name: kiran-desktop
Version: 2.6.0
Release: 10
Summary: Kiran desktop environment
#Group: #Group:
License: MulanPSL-2.0 License: MulanPSL-2.0
URL: https://gitee.com/openeuler/kiran-desktop #URL:
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# 设置Marco默认主题 # mate specific settings
Source1: 99_unikylin-mate-marco-general-theme.gschema.override Source1: 99_unikylin-mate-marco-general-theme.gschema.override
# 更改Mate Notification 通知位置 Source2: 99_unikylin-mate-application-calculator.gschema.override
Source2: 99_kiran-org-mate-NotificationDaemon.gschema.override Source3: 90_kiran-gc.gschema.override
# 服务器版本定制配置禁用Xorg screensaver以及DPMS Source4: kiran-mimeapps.list
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 %if "%{?kylin}" != ""
Requires: mate-media >= 1.22.1-1 Requires: gvfs-fuse
Requires: caja >= 1.22.0-1 Requires: mate-notification-daemon >= 1.22.0-1
Requires: fcitx >= 4.2.9.6-4 Requires: mate-media >= 1.22.1-1
Requires: gtk3 >= 3.22.30-4 Requires: caja >= 1.22.0-1
Requires: kylin-license-core >= 2.2 Requires: fcitx >= 4.2.9.6-4
Requires: kylin-license-client >= 2.2 Requires: gtk3 >= 3.22.30-4
Requires: kylin-license-tool >= 2.2 Requires: kylin-license-core >= 2.2
Requires: kiran-authentication-devices-sdk Requires: kylin-license-client >= 2.2
Requires: kylin-license-tool >= 2.2
%else %else
Requires: mate-notification-daemon Requires: gvfs-fuse3
Requires: mate-media Requires: mate-notification-daemon
Requires: caja Requires: mate-media
Requires: caja-open-terminal Requires: caja
Requires: fcitx Requires: caja-open-terminal
Requires: gtk3 Requires: fcitx
Requires: mate-screenshot Requires: gtk3
Requires: mate-screenshot
%endif %endif
%ifnarch loongarch64 sw_64 %ifnarch loongarch64 sw_64
Requires: firefox Requires: firefox
%endif %endif
Requires: xorg-x11-drivers Requires: xorg-x11-drivers
Requires: xorg-x11-server-Xorg Requires: xorg-x11-server-Xorg
Requires: xorg-x11-utils Requires: xorg-x11-utils
Requires: xorg-x11-xauth Requires: xorg-x11-xauth
Requires: xorg-x11-xinit Requires: xorg-x11-xinit
Requires: mesa-dri-drivers Requires: mesa-dri-drivers
Requires: lightdm Requires: lightdm
Requires: lightdm-gobject Requires: lightdm-gobject
Requires: NetworkManager Requires: NetworkManager
Requires: NetworkManager-adsl Requires: NetworkManager-adsl
Requires: NetworkManager-ovs Requires: NetworkManager-ovs
Requires: NetworkManager-ppp Requires: NetworkManager-ppp
Requires: NetworkManager-team Requires: NetworkManager-team
Requires: NetworkManager-wwan Requires: NetworkManager-wwan
Requires: nm-connection-editor Requires: nm-connection-editor
Requires: adwaita-gtk2-theme Requires: adwaita-gtk2-theme
Requires: google-noto-cjk-fonts Requires: google-noto-cjk-fonts
Requires: alsa-plugins-pulseaudio Requires: alsa-plugins-pulseaudio
Requires: dconf Requires: dconf
Requires: dconf-editor Requires: dconf-editor
Requires: flatpak Requires: flatpak
Requires: gvfs Requires: gvfs
Requires: gvfs-afc Requires: gvfs-afc
Requires: gvfs-afp Requires: gvfs-afp
Requires: gvfs-archive Requires: gvfs-archive
Requires: gvfs-gphoto2 Requires: gvfs-gphoto2
Requires: gvfs-mtp Requires: gvfs-mtp
Requires: gvfs-smb Requires: gvfs-smb
%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != "" Requires: mate-desktop
Requires: gvfs-fuse3 Requires: mate-menus
%else
Requires: gvfs-fuse
%endif
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
Requires: mate-desktop Requires: ntfs-3g
Requires: mate-menus 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: kwin Requires: p7zip
Requires: marco Requires: xdg-user-dirs-gtk
Requires: engrampa Requires: vim-enhanced
Requires: atril Requires: spice-vdagent
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
Requires: ntfs-3g Requires: kiran-authentication-service >= 2.5
Requires: ntfsprogs Requires: kiran-authentication-devices >= 2.5
Requires: pavucontrol Requires: kiran-session-manager >= 2.5
Requires: setroubleshoot Requires: kiran-control-panel >= 2.5
Requires: system-config-printer Requires: kiran-cpanel-launcher >= 2.4
Requires: fcitx-qt5 Requires: kiran-cc-daemon-common >= 2.5
Requires: fcitx-configtool Requires: kiran-session-daemon >= 2.5
Requires: glx-utils Requires: kiran-system-daemon >= 2.5
Requires: initial-setup-gui Requires: kiran-log-gtk3 >= 2.4
Requires: plymouth-system-theme 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: p7zip Obsoletes: kiran-cpanel-menu
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 %description
Kiran desktop environment Kiran desktop environment
@ -177,35 +151,20 @@ Kiran desktop environment
%install %install
mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
cp %{_builddir}/%{name}-%{version}/RELEASE.md %{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 "%{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 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
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
%endif
install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list
%post %post
/usr/bin/update-desktop-database &> /dev/null || : /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 %postun
/usr/bin/update-desktop-database &> /dev/null || : /usr/bin/update-desktop-database &> /dev/null || :
%posttrans %posttrans
glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
@ -214,62 +173,18 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
%{_datadir}/doc/%{name}/RELEASE.md %{_datadir}/doc/%{name}/RELEASE.md
%{_datadir}/applications/kiran-mimeapps.list %{_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-marco-general-theme.gschema.override
%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override %{_datadir}/glib-2.0/schemas/99_unikylin-mate-application-calculator.gschema.override
%if "%{kylinsec_server}" == "1"
%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf %if "%{ks_custom_name}" == "GC"
%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %{_datadir}/glib-2.0/schemas/90_kiran-gc.gschema.override
%endif %endif
%changelog %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 * Wed Sep 13 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-2
- KYBD: remove Require dejavu-fonts - KYBD: remove Require dejavu-fonts
* Tue Jul 25 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-1 * Tue Jul 25 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.1-1
- KYOS-F: add kiran-mimeapps.list file,add require atril(#10298) - KYOS-F: add kiran-mimeapps.list file,add require atril(#10298)
* Mon Jul 10 2023 meizhigang <meizhigang@kylinsec.com.cn> - 2.5.0-10 * Mon Jul 10 2023 meizhigang <meizhigang@kylinsec.com.cn> - 2.5.0-10
- KYOS-F: Add kiran gschema override for GC (#9113 #9379) - KYOS-F: Add kiran gschema override for GC (#9113 #9379)

View File

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

View File

@ -97,11 +97,7 @@ application/x-archive=engrampa.desktop
application/vnd.ms-cab-compressed=engrampa.desktop application/vnd.ms-cab-compressed=engrampa.desktop
text/plain=pluma.desktop text/plain=pluma.desktop
application/x-zerosize=pluma.desktop
inode/directory=caja-folder-handler.desktop inode/directory=caja-folder-handler.desktop
x-scheme-handler/computer=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