update to upstream version 3.1.0-34

0001-fix-city-name-display-issue-when-offline.patch

@@ -1,24 +0,0 @@
-From a853253406dc1c12cc20ee4383d3208dd5611ce2 Mon Sep 17 00:00:00 2001
-From: dou33 <johnwo3396@hotmail.com>
-Date: Tue, 26 Oct 2021 17:33:51 +0800
-Subject: [PATCH] fix city name display issue when offline
-
----
- src/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 3064a87..02a5875 100755
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -557,6 +557,7 @@ void MainWindow::setAbnormalMainWindow()
-     ui->lbCurrTmpUnit->setText("");
-     ui->lbCurrWea->setText("");
-     ui->lbCurrHum->setText("");
-+    cityLabel->setText("");
- 
-     ForecastWeather abnormalForecastweather;
-     for (int i=0; i<7; i++) {
--- 
-2.24.3 (Apple Git-128)
-

0001-fix-vnc-show-issue.patch

@@ -1,26 +0,0 @@
-From 90a2ef1e2e7593bd192c6ddf51e16a8914e8517b Mon Sep 17 00:00:00 2001
-From: dou33 <johnwo3396@hotmail.com>
-Date: Tue, 26 Oct 2021 17:32:01 +0800
-Subject: [PATCH] fix vnc show issue
-
----
- src/qtsingleapplication/qtsingleapplication.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp
-index d0fb15d..dc27559 100755
---- a/src/qtsingleapplication/qtsingleapplication.cpp
-+++ b/src/qtsingleapplication/qtsingleapplication.cpp
-@@ -324,7 +324,8 @@ void QtSingleApplication::activateWindow()
- {
-     if (actWin) {
-         actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized);
--        actWin->raise();
-+        actWin->show();//fix vnc display issue
-+	actWin->raise();
-         actWin->activateWindow();
-     }
- }
--- 
-2.24.3 (Apple Git-128)
-

0001-remove-about.patch

@@ -1,36 +0,0 @@
-From b480fa946aa57d43e5dc7ff9776c53f025c2054f Mon Sep 17 00:00:00 2001
-From: lvhan <lvhan@kylinos.cn>
-Date: Tue, 19 Jan 2021 16:39:53 +0800
-Subject: [PATCH] remove about
-
----
- src/mainwindow.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index f9e9027..d1ebd40 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -70,7 +70,8 @@ MainWindow::MainWindow(QWidget *parent) :
-     addCityAction = new AddCityAction(menu);
-     addCityAction->setText(tr("Add City"));
-     aboutAction = new QAction(tr("About"),menu);
--    actions<<addCityAction<<aboutAction;
-+//    actions<<addCityAction<<aboutAction;
-+    actions<<addCityAction;
-     menu->addActions(actions);
-     setBtn->setMenu(menu);
-     connect(addCityAction, &AddCityAction::requestSetCityName, this, [=] (QString cityName) {
-@@ -214,7 +215,8 @@ void MainWindow::initControlQss()
- 
-     setBtn->setFixedSize(30,30);
-     //menu跟主题走
--    menu->setFixedSize(120,66);
-+//    menu->setFixedSize(120,66);
-+    menu->setFixedSize(120,40);
-     menu->setStyleSheet("QMenu{border-radius:3px;background-color:white;color:black;}"
-                         "QMenu::item:selected {color:white;background-color: #2dabf9;}"
-                         "QMenu::item {font-size:14px;border-radius:4px;background-color: transparent;}");
--- 
-2.29.2.windows.2
-

indicator-china-weather.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           indicator-china-weather
 Version:        3.1.0
-Release:        5
+Release:        6
 Summary:        The weather data are from the heweather API s6 version.
 License:        GPL-3.0+
 URL:            https://github.com/UbuntuKylin/indicator-china-weather
@@ -21,10 +21,6 @@ BuildRequires:  GeoIP-devel
 
 # Requires: NetworkManager
 
-patch0:  0001-remove-about.patch
-patch1:  0001-fix-vnc-show-issue.patch
-
-
 %description
  Indicator that displays China weather information
  Kylin Weather displays detail weather information for one place,
@@ -33,8 +29,6 @@ patch1:  0001-fix-vnc-show-issue.patch
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  indicator-china-weather.pro
@@ -66,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/indicator-china-weather.1.gz
 
 %changelog
+* Tue Dec 7 2021 douyan <douyan@kylinos.cn> - 3.1.0-6
+- update to upstream version 3.1.0-34
+
 * Thu Oct 28 2021 douyan <douyan@kylinos.cn> - 3.1.0-5
 - fetch upstream release to 3.1.0-33