!42 kiran-control-panel,发布2.4版本,使用色块设计,加入新接口,兼容老接口,增加搜索内容

From: @liubuguiii 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-11-03 08:41:51 +00:00 committed by Gitee
commit 35587e3f69
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 16 additions and 1142 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,12 @@
Name: kiran-control-panel Name: kiran-control-panel
Version: 2.3.5 Version: 2.4.0
Release: 2 Release: 1
Summary: Kiran Control Panel Summary: Kiran Control Panel
Summary(zh_CN): Kiran桌面控制面板 Summary(zh_CN): Kiran桌面控制面板
License: MulanPSL-2.0 License: MulanPSL-2.0
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-fix-network-fix-the-self-test-defect-v-p-n.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 3.2 BuildRequires: cmake >= 3.2
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -16,6 +14,7 @@ BuildRequires: upower-devel
BuildRequires: zeromq-devel BuildRequires: zeromq-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: cryptopp-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtx11extras-devel
@ -31,23 +30,24 @@ BuildRequires: kiran-qdbusxml2cpp
BuildRequires: kiran-cc-daemon-devel BuildRequires: kiran-cc-daemon-devel
Requires: qt5-qtbase Requires: qt5-qtbase
Requires: qt5-qtbase-gui Requires: qt5-qtbase-gui
Requires: qt5-qtx11extras Requires: qt5-qtx11extras
Requires: qt5-qtsvg Requires: qt5-qtsvg
Requires: qt5-qtmultimedia Requires: qt5-qtmultimedia
Requires: kf5-networkmanager-qt Requires: kf5-networkmanager-qt
Requires: kiran-log-qt5 Requires: kiran-log-qt5
Requires: kiran-widgets-qt5 Requires: kiran-widgets-qt5 >= 2.4
Requires: kiran-qt5-integration Requires: kiran-qt5-integration >= 2.4
Requires: kiran-system-daemon Requires: kiran-system-daemon >= 2.4
Requires: kiran-session-daemon Requires: kiran-session-daemon >= 2.4
Requires: glib2 Requires: glib2
Requires: upower Requires: upower
Requires: zeromq Requires: zeromq
Requires: libnotify Requires: libnotify
Requires: pam Requires: pam
Requires: cryptopp
Requires: NetworkManager-l2tp Requires: NetworkManager-l2tp
#Requires: NetworkManager-pptp #Requires: NetworkManager-pptp
@ -76,17 +76,17 @@ BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-linguist BuildRequires: qt5-linguist
BuildRequires: kiran-log-qt5-devel BuildRequires: kiran-log-qt5-devel
BuildRequires: kiran-widgets-qt5-devel BuildRequires: kiran-widgets-qt5-devel >= 2.4
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: kiran-qt5-integration-devel BuildRequires: kiran-qt5-integration-devel >= 2.4
Requires: qt5-qtbase Requires: qt5-qtbase
Requires: qt5-qtx11extras Requires: qt5-qtx11extras
Requires: qt5-qtsvg Requires: qt5-qtsvg
Requires: kiran-log-qt5 Requires: kiran-log-qt5
Requires: kiran-widgets-qt5 Requires: kiran-widgets-qt5 >= 2.4
Requires: glib2 Requires: glib2
Requires: kiran-qt5-integration Requires: kiran-qt5-integration >= 2.4
%description -n kiran-cpanel-launcher %description -n kiran-cpanel-launcher
%{summary}. %{summary}.
@ -112,9 +112,7 @@ make %{?_smp_mflags}
%dir %{_datadir}/kiran-control-panel %dir %{_datadir}/kiran-control-panel
%{_bindir}/kiran-control-panel %{_bindir}/kiran-control-panel
%{_datadir}/kiran-control-panel/* %{_datadir}/kiran-control-panel/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/* %{_datadir}/icons/hicolor/*
%exclude %{_datadir}/kiran-control-panel/translations/kiran-cpanel-launcher*
%exclude %{_datadir}/applications/kiran-control-panel.desktop %exclude %{_datadir}/applications/kiran-control-panel.desktop
#account #account
@ -125,37 +123,12 @@ make %{?_smp_mflags}
#audio #audio
%{_sysconfdir}/xdg/autostart/kiran-audio-status-icon.desktop %{_sysconfdir}/xdg/autostart/kiran-audio-status-icon.desktop
%{_bindir}/kiran-audio-status-icon %{_bindir}/kiran-audio-status-icon
%{_datadir}/kiran-cpanel-audio/translations/*
#network #network
%{_sysconfdir}/xdg/autostart/kiran-network-status-icon.desktop %{_sysconfdir}/xdg/autostart/kiran-network-status-icon.desktop
%{_bindir}/kiran-network-status-icon %{_bindir}/kiran-network-status-icon
/etc/NetworkManager/conf.d/00-server.conf /etc/NetworkManager/conf.d/00-server.conf
#display
%{_datadir}/kiran-cpanel-display/translations/*
#mouse
%{_datadir}/kiran-cpanel-mouse/translations/*
#power
%{_datadir}/kiran-cpanel-power/translations/*
#system
%{_datadir}/kiran-cpanel-system/translations/*
#appearance
%{_datadir}/kiran-cpanel-appearance/translations/*
#keybinding
%{_datadir}/kiran-cpanel-keybinding/translations/*
#keyboard
%{_datadir}/kiran-cpanel-keyboard/translations/*
#timedate
%{_datadir}/kiran-cpanel-timedate/translations/*
%files -n kiran-cpanel-launcher %files -n kiran-cpanel-launcher
%{_bindir}/kiran-cpanel-launcher %{_bindir}/kiran-cpanel-launcher
@ -168,6 +141,9 @@ make %{?_smp_mflags}
rm -rf %{buildroot} rm -rf %{buildroot}
%changelog %changelog
* Thu Nov 03 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-1
- KYOS-F: release 2.4,new plugin interface,using color block design
* Tue Sep 06 2022 luoqing <luoqing@kylinsec.com.cn> - 2.3.5-2 * Tue Sep 06 2022 luoqing <luoqing@kylinsec.com.cn> - 2.3.5-2
- KYOS-F: Fix V-P-N self-test defects - KYOS-F: Fix V-P-N self-test defects