fix(shotcut): Complete the shortcut key dependencies and modify the default GSettings value of the calculator

- 补齐快捷键依赖,修改计算器默认GSettings值

Closes #I7C0TD
This commit is contained in:
liuxinhao 2023-06-29 09:08:47 +08:00
parent 0cae14d1bb
commit abed365223
2 changed files with 55 additions and 66 deletions

View File

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

View File

@ -1,30 +1,49 @@
%define debug_package %{nil}
Name: kiran-desktop
Name: kiran-desktop
Version: 2.5.0
Release: 7
Release: 8
Summary: Kiran desktop environment
#Group:
#Group:
License: MulanPSL-2.0
#URL:
#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
Source2: 99_unikylin-mate-application-calculator.gschema.override
%if "%{?kylin}" != ""
Requires: gvfs-fuse
Requires: mate-notification-daemon >= 1.22.0-1
Requires: mate-media >= 1.22.1-1
Requires: caja >= 1.22.0-1
Requires: fcitx >= 4.2.9.6-4
Requires: gtk3 >= 3.22.30-4
Requires: kylin-license-core >= 2.2
Requires: kylin-license-client >= 2.2
Requires: kylin-license-tool >= 2.2
%else
Requires: gvfs-fuse3
Requires: mate-notification-daemon
Requires: mate-media
Requires: caja
Requires: caja-open-terminal
Requires: fcitx
Requires: gtk3
Requires: mate-screenshot
%endif
%ifnarch loongarch64 sw_64
Requires: firefox
%endif
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 "%{?kylin}" != ""
Requires: gtk3 >= 3.22.30-4
%else
Requires: gtk3
%endif
Requires: lightdm
Requires: lightdm-gobject
@ -38,7 +57,7 @@ Requires: nm-connection-editor
Requires: adwaita-gtk2-theme
Requires: google-noto-cjk-fonts
Requires: dejavu-fonts
Requires: dejavu-fonts
Requires: alsa-plugins-pulseaudio
Requires: dconf
@ -49,38 +68,18 @@ Requires: gvfs
Requires: gvfs-afc
Requires: gvfs-afp
Requires: gvfs-archive
%if "%{?kylin}" != ""
Requires: gvfs-fuse
%else
Requires: gvfs-fuse3
%endif
Requires: gvfs-gphoto2
Requires: gvfs-mtp
Requires: gvfs-smb
Requires: mate-desktop
Requires: mate-menus
%if "%{?kylin}" != ""
Requires: mate-notification-daemon >= 1.22.0-1
%else
Requires: mate-notification-daemon
%endif
%if "%{?kylin}" != ""
Requires: mate-media >= 1.22.1-1
%else
Requires: mate-media
%endif
%if "%{?kylin}" != ""
Requires: caja >= 1.22.0-1
%else
Requires: caja
Requires: caja-open-terminal
%endif
Requires: kwin
Requires: marco
Requires: engrampa
Requires: pluma
Requires: eom
Requires: eom
Requires: mate-settings-daemon
Requires: mate-user-guide
Requires: mate-menus-preferences-category-menu
@ -94,21 +93,12 @@ Requires: lm_sensors
Requires: gnome-disk-utility
Requires: firewall-config
%ifnarch loongarch64 sw_64
Requires: firefox
%endif
Requires: ntfs-3g
Requires: ntfsprogs
Requires: pavucontrol
Requires: setroubleshoot
Requires: system-config-printer
%if "%{?kylin}" != ""
Requires: fcitx >= 4.2.9.6-4
%else
Requires: fcitx
%endif
Requires: fcitx-qt5
Requires: fcitx-qt5
Requires: fcitx-configtool
Requires: glx-utils
Requires: initial-setup-gui
@ -122,13 +112,13 @@ Requires: spice-vdagent
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.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-log-gtk3 >= 2.4
Requires: kiran-log-qt5 >= 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
@ -139,24 +129,13 @@ 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-flameshot
Requires: kiran-wallpapers
Requires: kiran-themes
Requires: kiran-panel
Requires: kiran-panel-libs
Requires: kiran-panel-libs
%if "%{?kylin}" != ""
Requires: kylin-license-core >= 2.2
Requires: kylin-license-client >= 2.2
Requires: kylin-license-tool >= 2.2
%else
#Requires: kylin-license-core >= 2.2
#Requires: kylin-license-client >= 2.2
#Requires: kylin-license-tool >= 2.2
%endif
Requires: fcitx-qt5
Obsoletes: kiran-cpanel-menu
Obsoletes: kiran-cpanel-menu
%description
Kiran desktop environment
@ -171,6 +150,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_unikylin-mate-application-calculator.gschema.override
%post
/usr/bin/update-desktop-database &> /dev/null || :
@ -178,13 +158,19 @@ install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin
%postun
/usr/bin/update-desktop-database &> /dev/null || :
%posttrans
glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || :
%files
%dir %{_datadir}/doc/%{name}
%{_datadir}/doc/%{name}/RELEASE.md
%{_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
%changelog
* Tue Jun 27 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.0-8
- KYOS-F: Community version adds dependency mate-screenshot, add Gsettings overlay to start kiran calculator(#I7C0TD)
* Mon Jun 19 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.5.0-7
- KYOS-F: Add kwin's installation dependencies to support wayland sessions(#I7C89D)