packages/kiran-desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 update to 2.2

Browse Source 
Merge pull request !9 from kylinsecos/master
This commit is contained in:
openeuler-ci-bot 2022-01-22 07:53:01 +00:00 committed by Gitee
commit e40183c9da
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
kiran-desktop-2.2.tar.gz Normal file
View File

Binary file not shown.

163
kiran-desktop.spec
View File

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

BIN
kiran-desktop.tar.gz
View File

Binary file not shown.