!20 sync openEuler-22.03-LTS-Next to master

From: @peijiankang 
Reviewed-by: @tanyulong2021 
Signed-off-by: @tanyulong2021

0001-Change-the-distance-between-mainwindow-and-taskbar.patch

@@ -1,55 +0,0 @@
-From a1b4df4311e6b75204aec067c716f38a9ad7a830 Mon Sep 17 00:00:00 2001
-From: chenlelin <chenlelin@kylinos.cn>
-Date: Tue, 13 Oct 2020 09:12:22 +0800
-Subject: [PATCH] Change the distance between mainwindow and taskbar
-
----
- src/mainwindow.cpp  | 2 +-
- src/oneconnform.cpp | 3 ---
- src/onelancform.cpp | 3 ---
- 3 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index e1d7b74..d74cdb9 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -684,7 +684,7 @@ void MainWindow::handleIconClicked()
- 
-     int n = objKyDBus->getTaskBarPos("position");
-     int m = objKyDBus->getTaskBarHeight("height");
--    int d = 2; //窗口边沿到任务栏距离
-+    int d = 7; //窗口边沿到任务栏距离
- 
-     if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()) {
-         if (n == 0) {
-diff --git a/src/oneconnform.cpp b/src/oneconnform.cpp
-index 05bd127..e6f6bbc 100644
---- a/src/oneconnform.cpp
-+++ b/src/oneconnform.cpp
-@@ -83,9 +83,6 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
- //    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
- //                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
- //                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
--    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(156,156,156,0.2);}"
--                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(156,156,156,0.3);}"
--                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-     ui->btnHideConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);color:white;font-size:14px;}"
-                                "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(107,142,235,1);}"
-                                "QPushButton:Pressed{border-radius:4px;background-color:rgba(50,87,202,1);}");
-diff --git a/src/onelancform.cpp b/src/onelancform.cpp
-index cf6d46b..b23e387 100644
---- a/src/onelancform.cpp
-+++ b/src/onelancform.cpp
-@@ -57,9 +57,6 @@ OneLancForm::OneLancForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
- //    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);color:white;font-size:14px;}"
- //                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
- //                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}");
--    ui->btnDisConn->setStyleSheet("QPushButton{border:0px;border-radius:4px;background-color:rgba(156,156,156,0.2);}"
--                               "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(156,156,156,0.3);}"
--                               "QPushButton:Pressed{border-radius:4px;background-color:rgba(156,156,156,0.1);}");
-     ui->lbWaiting->setStyleSheet("QLabel{border:0px;border-radius:4px;background-color:rgba(61,107,229,1);}");
-     ui->lbWaitingIcon->setStyleSheet("QLabel{border:0px;background-color:transparent;}");
- 
--- 
-2.33.0
-

kylin-nm.spec

@@ -1,12 +1,10 @@
 Name:           kylin-nm
-Version:        3.0.2
+Version:        3.0.3
-Release:        9
+Release:        1
 Summary:        Gui Applet tool for display and edit network simply
 License:        GPL-3+
 URL:            https://github.com/ukui/kylin-nm/
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         0001-Change-the-distance-between-mainwindow-and-taskbar.patch
-Patch1:         0001-Adjust-font-size.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -17,6 +15,7 @@ BuildRequires:  gsettings-qt-devel
 BuildRequires:  kf5-kwindowsystem-devel
 BuildRequires:  libX11-devel
 BuildRequires:  qt5-qtsvg-devel
+BuildRequires:  ethtool
 Requires: NetworkManager
 Requires: network-manager-applet
 %description
@@ -26,8 +25,6 @@ Requires: network-manager-applet
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  kylin-nm.pro	
@@ -52,8 +49,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/kylin-nm/changelog.gz
 %{_datadir}/doc/kylin-nm/copyright
 %{_mandir}/man1/kylin-nm.1.gz
+/etc/dbus-1/system.d/com.kylin.NetworkManager.qt.systemdbus.conf
+/usr/share/dbus-1/system-services/com.kylin.NetworkManager.qt.systemdbus.service
+
 
 %changelog
+* Tue Jan 25 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.3-1
+- update 3.0.3
+
 * Wed Jun 29 2022 huayadong <huayadong@kylinos.cn> - 3.0.2-9
 - Adjust font size