From 0a92d93165274a63a0d44d31f0300f26f9f7af85 Mon Sep 17 00:00:00 2001 From: kylinsecos_admin Date: Tue, 15 Mar 2022 19:47:27 +0800 Subject: [PATCH] update to 2.2-10 --- kiran-desktop.spec | 143 ++++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 68 deletions(-) diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 5497bfb..d2454a6 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,9 +1,8 @@ %define debug_package %{nil} -%global on_openeuler 1 Name: kiran-desktop Version: 2.2 -Release: 7 +Release: 10 Summary: Kiran desktop environment #Group: @@ -20,10 +19,10 @@ Requires: NetworkManager-team Requires: NetworkManager-wwan Requires: adwaita-gtk2-theme Requires: alsa-plugins-pulseaudio -%if 0%{?on_openeuler} -Requires: caja +%if 0%{?kylin} +Requires: caja >= 1.22.0-1%{?dist}.kb36 %else -Requires: caja >= 1.22.0-1%{?dist}.kb36 +Requires: caja %endif Requires: dconf Requires: flatpak @@ -33,7 +32,11 @@ Requires: gvfs Requires: gvfs-afc Requires: gvfs-afp Requires: gvfs-archive -Requires: gvfs-fuse3 +%if 0%{?kylin} +Requires: gvfs-fuse +%else +Requires: gvfs-fuse3 +%endif Requires: gvfs-gphoto2 Requires: gvfs-mtp Requires: gvfs-smb @@ -46,10 +49,10 @@ Requires: marco Requires: mate-control-center Requires: mate-desktop Requires: mate-menus -%if 0%{?on_openeuler} -Requires: mate-notification-daemon +%if 0%{?kylin} +Requires: mate-notification-daemon >= 1.22.0-1%{?dist}.kb7 %else -Requires: mate-notification-daemon >= 1.22.0-1%{?dist}.kb7 +Requires: mate-notification-daemon %endif Requires: mate-settings-daemon Requires: mate-user-guide @@ -63,28 +66,30 @@ Requires: yelp Requires: NetworkManager Requires: dconf-editor Requires: engrampa -Requires: firefox +%ifarch x86_64 aarch64 +Requires: firefox +%endif Requires: firewall-config Requires: lightdm Requires: lightdm-gobject Requires: mate-menus-preferences-category-menu Requires: mate-terminal -%if 0%{?on_openeuler} -Requires: network-manager-applet -Requires: mate-media +%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 >= 1.18.0-2%{?dist}.kb6 -Requires: mate-media >= 1.22.1-1%{?dist}.kb8 +Requires: network-manager-applet +Requires: mate-media %endif Requires: pluma Requires: setroubleshoot Requires: system-config-printer Requires: vim-enhanced Requires: initial-setup-gui -%if 0%{?on_openeuler} -Requires: fcitx +%if 0%{?kylin} +Requires: fcitx >= 4.2.9.6-4%{?dist}.kb10 %else -Requires: fcitx >= 4.2.9.6-4%{?dist}.kb10 +Requires: fcitx %endif Requires: glx-utils @@ -97,57 +102,58 @@ Requires: xorg-x11-server-Xorg Requires: xorg-x11-utils Requires: xorg-x11-xauth Requires: xorg-x11-xinit -%if 0%{?on_openeuler} -Requires: gtk3 -%else +%if 0%{?kylin} Requires: gtk3 >= 3.22.30-4%{?dist}.kb6 +%else +Requires: gtk3 %endif -Requires: kiran-calculator >= 2.2 kiran-calculator < 2.3 +Requires: kiran-calculator >= 2.2 Requires: kiran-flameshot Requires: kiran-wallpapers -Requires: kiran-gtk-theme >= 2.2.1 kiran-gtk-theme < 2.3 -Requires: kiran-icon-theme >= 0.8.0-6 kiran-icon-theme < 2.3 +Requires: kiran-gtk-theme >= 2.2.1 +Requires: kiran-icon-theme >= 0.8.0-6 Requires: kiran-themes -Requires: kiran-log-gtk3 >= 2.1 kiran-log-gtk3 < 2.3 -Requires: kiran-log-qt5 >= 2.1 kiran-log-qt5 < 2.3 -Requires: kiran-widgets-qt5 >= 2.2 kiran-widgets-qt5 < 2.3 -Requires: kiran-session-manager >= 2.2 kiran-session-manager < 2.3 -Requires: kiran-control-panel >= 2.1 kiran-control-panel < 2.3 -Requires: kiran-cpanel-launcher >= 2.1 kiran-cpanel-launcher < 2.3 -Requires: kiran-cpanel-timedate >= 2.1 kiran-cpanel-timedate < 2.3 -Requires: kiran-cpanel-account >= 2.1 kiran-cpanel-account < 2.3 -%if 0%{?on_openeuler} -#Requires: kiran-cpanel-system >= 2.2 kiran-cpanel-system < 2.3 +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 kiran-cpanel-system < 2.3 +#Requires: kiran-cpanel-system >= 2.2 %endif -Requires: kiran-cpanel-mouse >= 2.2 kiran-cpanel-mouse < 2.3 -Requires: kiran-cpanel-power >= 2.2 kiran-cpanel-power < 2.3 -Requires: kiran-cpanel-display >= 2.1 kiran-cpanel-display < 2.3 -Requires: kiran-cpanel-keyboard >= 2.2 kiran-cpanel-keyboard < 2.3 -Requires: kiran-cpanel-keybinding >= 2.2 kiran-cpanel-keyboard < 2.3 -Requires: kiran-cpanel-appearance >= 2.2 kiran-cpanel-appearance < 2.3 -Requires: kiran-cc-daemon-common >= 2.2.1 kiran-cc-daemon-common < 2.3 -Requires: kiran-session-daemon >= 2.2.1 kiran-session-daemon < 2.3 -Requires: kiran-system-daemon >= 2.2.1 kiran-system-daemon < 2.3 -Requires: kiran-screensaver-dialog >= 2.2.1 kiran-screensaver-dialog < 2.3 -Requires: lightdm-kiran-greeter >= 2.2.1 lightdm-kiran-greeter < 2.3 -Requires: kiran-screensaver >= 2.2.0-5 kiran-screensaver < 2.3 +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-screensaver >= 2.2.0-5 Requires: kiran-panel Requires: kiran-panel-libs -Requires: kiran-applets >= 2.2.6-4 kiran-applets < 2.3 -Requires: kiran-calendar >= 2.2 kiran-calendar < 2.3 -%if 0%{?on_openeuler} -#Requires: kylin-license-core >= 2.2 kylin-license-core < 2.4 -#Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 -#Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 +Requires: kiran-applets >= 2.2.6-4 +Requires: kiran-calendar >= 2.2 +%if 0%{?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 kylin-license-core < 2.4 -Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 -Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 +#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 %description @@ -162,24 +168,25 @@ Kiran desktop environment mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ cp %{_builddir}/%{name}-%{version}/RELEASE.md %{buildroot}/%{_datadir}/doc/%{name}/ -%post -for i in background keybindings keyboard mouse xrandr xsettings; do - gsettings set org.mate.SettingsDaemon.plugins.${i} active false -done - -%postun -for i in background keybindings keyboard mouse xrandr xsettings; do - gsettings set org.mate.SettingsDaemon.plugins.${i} active true -done - %files %dir %{_datadir}/doc/%{name} %{_datadir}/doc/%{name}/RELEASE.md %changelog -* Mon Feb 28 2022 longcheng - 2.2-7 -- KYOS-B: remove Requires: zint +* Tue Mar 15 2022 longcheng - 2.2-10 +- KYOS-B: fix spec error + +* Mon Mar 14 2022 longcheng - 2.2-9 +- KYOS-B: Add Requires fcitx-qt5 +- KYOS-B: Remove post scripts and postun scripts + +* Mon Feb 28 2022 longcheng - 2.2-8 +- KYOS-B: remove Requires zint +- KYOS-B: remove Requires firefox for KY3.4-3-LS + +* Thu Feb 24 2022 chendingjian - 2.2-7 +- rebuild for KY3.4-MATE-modules-dev * Wed Jan 26 2022 longcheng - 2.2-6.kb4 - KYOS-B: remove and modify some Requires in openeuler -- Gitee