diff --git a/kiran-desktop-2.2.tar.gz b/kiran-desktop-2.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cbe4ffd2ca6917755460f271cc5786dec8ad317c Binary files /dev/null and b/kiran-desktop-2.2.tar.gz differ diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 134764ef5f86981dc5d1cbf51e7a65c1c0beb54b..367d144bc076150a2e60e6a4fff120fd1741f78b 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,14 +1,15 @@ %define debug_package %{nil} +%global on_openeuler 1 Name: kiran-desktop -Version: 2.1 -Release: 3%{?dist} -Summary: Kiran desktop environment one click installation +Version: 2.2 +Release: 6.kb2 +Summary: Kiran desktop environment #Group: License: Mulan PSL v2 #URL: -Source0: kiran-desktop.tar.gz +Source0: %{name}-%{version}.tar.gz BuildArch: noarch #BuildRequires: @@ -19,7 +20,11 @@ Requires: NetworkManager-team Requires: NetworkManager-wwan Requires: adwaita-gtk2-theme Requires: alsa-plugins-pulseaudio -Requires: caja +%if 0%{?on_openeuler} +Requires: caja +%else +Requires: caja >= 1.22.0-1%{?dist}.kb36 +%endif Requires: dconf Requires: flatpak Requires: gnome-disk-utility @@ -41,8 +46,11 @@ Requires: marco Requires: mate-control-center Requires: mate-desktop Requires: mate-menus -Requires: mate-notification-daemon -Requires: mate-panel +%if 0%{?on_openeuler} +Requires: mate-notification-daemon +%else +Requires: mate-notification-daemon >= 1.22.0-1%{?dist}.kb7 +%endif Requires: mate-settings-daemon Requires: mate-user-guide Requires: nm-connection-editor @@ -52,6 +60,7 @@ Requires: p7zip Requires: pavucontrol Requires: xdg-user-dirs-gtk Requires: yelp +Requires: zint Requires: NetworkManager Requires: dconf-editor Requires: engrampa @@ -61,14 +70,23 @@ Requires: lightdm Requires: lightdm-gobject Requires: mate-menus-preferences-category-menu Requires: mate-terminal -Requires: network-manager-applet -Requires: mate-media +%if 0%{?on_openeuler} +Requires: network-manager-applet +Requires: mate-media +%else +Requires: network-manager-applet >= 1.18.0-2%{?dist}.kb6 +Requires: mate-media >= 1.22.1-1%{?dist}.kb8 +%endif Requires: pluma Requires: setroubleshoot Requires: system-config-printer Requires: vim-enhanced Requires: initial-setup-gui -Requires: fcitx-sunpinyin +%if 0%{?on_openeuler} +Requires: fcitx +%else +Requires: fcitx >= 4.2.9.6-4%{?dist}.kb10 +%endif Requires: glx-utils Requires: initial-setup-gui @@ -80,74 +98,103 @@ Requires: xorg-x11-server-Xorg Requires: xorg-x11-utils Requires: xorg-x11-xauth Requires: xorg-x11-xinit -Requires: xvattr - +%if 0%{?on_openeuler} +Requires: gtk3 +%else +Requires: gtk3 >= 3.22.30-4%{?dist}.kb6 +%endif + +Requires: kiran-calculator >= 2.2 kiran-calculator < 2.3 +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-themes -Requires: kiran-flameshot -Requires: kiran-session-manager -Requires: kiran-gtk-theme -Requires: kiran-cpanel-mouse -Requires: kiran-cpanel-menu -Requires: kiran-cc-daemon-common -Requires: kiran-session-daemon -Requires: kiran-system-daemon -Requires: kiran-cpanel-display -Requires: kiran-widgets-qt5 -Requires: kiran-calendar -Requires: kiran-cpanel-timedate -Requires: kiran-icon-theme -Requires: lightdm-kiran-greeter -Requires: kiran-control-panel -Requires: kiran-cpanel-launcher -Requires: kiran-cpanel-account -Requires: kiran-applets +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 +Requires: kiran-cpanel-system >= 2.2 kiran-cpanel-system < 2.3 +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-panel -Requires: kiran-panel-libs -Requires: kiran-log-gtk3 -Requires: kiran-log-qt5 - +Requires: kiran-panel-libs +Requires: kiran-applets >= 2.2.6-4 kiran-applets < 2.3 +Requires: kiran-calendar >= 2.2 kiran-calendar < 2.3 +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 +Obsoletes: kiran-cpanel-menu %description -KiranUI-2.1-OE desktop +Kiran desktop environment %prep -%setup -q -n kiran-desktop-2.1-1 - +%autosetup -p1 %build - %install -mkdir -p %{buildroot}/usr/share/ - -cp -pr %{_builddir}/kiran-desktop-2.1-1/doc %{buildroot}/usr/share/ - -cp -pr %{_builddir}/kiran-desktop-2.1-1/glib-2.0 %{buildroot}/usr/share/ +mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ +cp %{_builddir}/%{name}-%{version}/RELEASE.md %{buildroot}/%{_datadir}/doc/%{name}/ %post - -#set screensaver -if [ -f /etc/lightdm/kiran-greeter.conf ]; then - sed -i 's/\/usr\/share\/backgrounds\/default.jpg/\/usr\/share\/backgrounds\/kiran\/Sky.png/g' /etc/lightdm/kiran-greeter.conf -fi - +for i in background keybindings keyboard mouse xrandr xsettings; do + gsettings set org.mate.SettingsDaemon.plugins.${i} active false +done %postun -if [ -f /etc/lightdm/kiran-greeter.conf ]; then - sed -i 's/\/usr\/share\/backgrounds\/kiran\/Sky.png/\/usr\/share\/backgrounds\/default.jpg/g' /etc/lightdm/kiran-greeter.conf -fi +for i in background keybindings keyboard mouse xrandr xsettings; do + gsettings set org.mate.SettingsDaemon.plugins.${i} active true +done + %files -/usr/share/doc/kiran-desktop/* -/usr/share/glib-2.0/schemas/* +%dir %{_datadir}/doc/%{name} +%{_datadir}/doc/%{name}/RELEASE.md + %changelog -* Wed Dec 21 2021 tangjie02 - 2.1-3 -- KYOS-F: Add require fcitx-sunpinyin. +* Wed Jan 19 2022 tangjie02 - 2.2-6.kb2 +- KYOS-F: Modify the max require version of kylin-license to 2.4. + +* Mon Jan 17 2022 longcheng - 2.2-5.kb2 +- KYOS-F: fix desktop icon theme is not Kiran (#49251) + +* Wed Dec 29 2021 kpkg - 2.2-5.kb1 +- rebuild for KY3.4-MATE-modules-dev + +* Wed Dec 29 2021 caoyuanji - 2.2-5 +- Upgrade version number for easy upgrade + +* Tue Dec 28 2021 caoyuanji - 2.2-4.kb1 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Tue Nov 23 2021 tangjie02 2.2-4.ky3 +- KYOS-B: Remove kiran-cpanel-menu from require packages. + +* Tue Nov 23 2021 tangjie02 2.2-3.ky3 +- KYOS-B: Add new Requires. + +* Mon Nov 22 2021 tangjie02 2.2-2.ky3 +- KYOS-B: Restricted version for requires packages. -* Fri Dec 10 2021 tangjie02 - 2.1-2 -- KYOS-F: Delete zint and add mate-media. +* Mon Nov 22 2021 tangjie02 2.2-1.ky3 +- KYOS-F: New KiranUI2.2 -* Tue Oct 26 2021 xiewenhao -2.1-1 +* Tue Oct 26 2021 xiewenhao 2.1-1.ky3 - KYOS：create kiran-desktop diff --git a/kiran-desktop.tar.gz b/kiran-desktop.tar.gz deleted file mode 100644 index 6a1920b023d685196c8ea2a2b5e73ef1161671c7..0000000000000000000000000000000000000000 Binary files a/kiran-desktop.tar.gz and /dev/null differ