fix translation and theme issue

0001-fix-title-bar-issue.patch

@@ -1,12 +0,0 @@
-diff -ur time-shutdown-1.1.1/src/widget.cpp time-shutdown-1.1.1~/src/widget.cpp
---- time-shutdown-1.1.1/src/widget.cpp	2019-05-27 15:48:18.000000000 +0800
-+++ time-shutdown-1.1.1~/src/widget.cpp	2020-12-01 15:40:11.030885516 +0800
-@@ -108,6 +108,8 @@
-     this->setWindowFlag(Qt::FramelessWindowHint);
-     this->setAttribute(Qt::WA_TranslucentBackground);
-     this->setWindowIcon(QIcon::fromTheme("ukui-time_shutdown", QIcon("://image/time_shutdown.svg")));
-+    //hide title bar
-+    this->setWindowFlags(Qt::FramelessWindowHint | Qt::Widget);
- }
- 
- Widget::~Widget()

0002-add-header-file.patch

@@ -1,55 +0,0 @@
-From d9dc317b68246c3361c3f740c061f1103c0910c7 Mon Sep 17 00:00:00 2001
-From: tanyulong2021 <tanyulong@kylinos.cn>
-Date: Thu, 10 Feb 2022 16:51:36 +0800
-Subject: [PATCH] add header file
-
----
- src/comboxwidget.cpp   | 1 +
- src/dropdownbox.cpp    | 1 +
- src/timeshowwidget.cpp | 1 +
- src/widget.cpp         | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/src/comboxwidget.cpp b/src/comboxwidget.cpp
-index 98dd60b..b1e0a43 100755
---- a/src/comboxwidget.cpp
-+++ b/src/comboxwidget.cpp
-@@ -1,4 +1,5 @@
- #include "comboxwidget.h"
-+#include <QPainterPath>
- 
- comBoxWidget::comBoxWidget(QWidget *parent) : QWidget(parent)
- {
-diff --git a/src/dropdownbox.cpp b/src/dropdownbox.cpp
-index 4965f3d..32abf24 100755
---- a/src/dropdownbox.cpp
-+++ b/src/dropdownbox.cpp
-@@ -1,4 +1,5 @@
- #include "dropdownbox.h"
-+#include <QPainterPath>
- 
- dateSelectionWidget::dateSelectionWidget(QString week, QWidget *parent) : QWidget(parent)
- {
-diff --git a/src/timeshowwidget.cpp b/src/timeshowwidget.cpp
-index 0b740e5..47ec861 100755
---- a/src/timeshowwidget.cpp
-+++ b/src/timeshowwidget.cpp
-@@ -1,4 +1,5 @@
- #include "timeshowwidget.h"
-+#include <QPainterPath>
- 
- BlankShadowWidget::BlankShadowWidget(QWidget *parent) : QWidget(parent)
- {
-diff --git a/src/widget.cpp b/src/widget.cpp
-index bf984da..0e1344a 100755
---- a/src/widget.cpp
-+++ b/src/widget.cpp
-@@ -1,4 +1,5 @@
- #include "widget.h"
-+#include <QPainterPath>
- 
- /* 上方Menu界面 */
- menuBarWidget::menuBarWidget(QWidget *parent) : QWidget(parent)
--- 
-2.33.0
-

add_desktop_file.patch

@@ -0,0 +1,18 @@
+diff -Naur time-shutdown-1.1.1/time-shutdown.pro time-shutdown-1.1.1~/time-shutdown.pro
+--- time-shutdown-1.1.1/time-shutdown.pro	2021-11-04 16:30:10.000000000 +0800
++++ time-shutdown-1.1.1~/time-shutdown.pro	2022-03-04 14:27:52.702298450 +0800
+@@ -42,11 +42,11 @@
+ schemes.files += data/org.ukui.time.shutdown.settings.gschema.xml
+ schemes.path = /usr/share/glib-2.0/schemas/
+ 
+-#desktopfile.files = data/ukui-time-shotdown.desktop
+-#desktopfile.path = /usr/share/applications/
++desktopfile.files = data/ukui-time-shotdown.desktop
++desktopfile.path = /usr/share/applications/
+ 
+ target.path = /usr/bin/
+ 
+-INSTALLS += target schemes  translation
++INSTALLS += target schemes translation desktopfile
+ # Default rules for deployment.
+ 

time-shutdown.spec

@@ -1,6 +1,6 @@
 Name:           time-shutdown 
 Version:        1.1.1
-Release:        3
+Release:        4
 Summary:        The time-shutdown is mainly used in the desktop operating system
 
 License:        GPL-3+
@@ -16,8 +16,7 @@ Requires:  gsettings-qt
 Requires:  libX11
 Requires:  ukui-notification-daemon
 
-patch0:  0001-fix-title-bar-issue.patch
+Patch0: add_desktop_file.patch
-patch1:  0002-add-header-file.patch
 
 %description
  The time-shutdown is mainly used in the desktop operating system.
@@ -26,9 +25,7 @@ patch1:  0002-add-header-file.patch
  and a notification popup will be sent. You can select, postpone and set.
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0 -p1
-%patch1 -p1
 
 %build
 export PATH=%{_qt5_bindir}:$PATH
@@ -52,11 +49,14 @@ popd
 %{_datadir}/ukui-time-shutdown/time-shutdown_zh_CN.qm
 
 %changelog
+* Fri Mar 4 2022 douyan <douyan@kylinos.cn> - 1.1.1-4
+- update to upstream version 1.1.1
+
 * Thu Feb 10 2022 tanyulong <tanyulong@kylinos.cn> - 1.1.1-3
 - fix missing head file error
 
 * Tue Dec 1 2020 douyan <douyan@kylinos.cn> - 1.1.1-2
 - fix-title-bar-issue
 
-* Wen Nov 11 2020 douyan <douyan@kylinos.cn> - 1.1.1-1
+* Wed Nov 11 2020 douyan <douyan@kylinos.cn> - 1.1.1-1
 - update to upstream version 1.1.0-1-0001+1031