diff --git a/0001-fix-title-bar-issue.patch b/0001-fix-title-bar-issue.patch deleted file mode 100644 index 8813b3119c36124e0b955415ef654dba1db0034b..0000000000000000000000000000000000000000 --- a/0001-fix-title-bar-issue.patch +++ /dev/null @@ -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() diff --git a/0002-add-header-file.patch b/0002-add-header-file.patch deleted file mode 100644 index d4e08e2a5af03649eee91e72b23fad1ad08fe2c6..0000000000000000000000000000000000000000 --- a/0002-add-header-file.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d9dc317b68246c3361c3f740c061f1103c0910c7 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -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 - - 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 - - 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 - - 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 - - /* 上方Menu界面 */ - menuBarWidget::menuBarWidget(QWidget *parent) : QWidget(parent) --- -2.33.0 - diff --git a/add_desktop_file.patch b/add_desktop_file.patch new file mode 100644 index 0000000000000000000000000000000000000000..14d79389c50af73f6080fa98250bcef12f6dbc1e --- /dev/null +++ b/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. + diff --git a/time-shutdown-1.1.1.tar.gz b/time-shutdown-1.1.1.tar.gz deleted file mode 100644 index 9f5ea4b173dfb178e3579f43b267e09f3c782559..0000000000000000000000000000000000000000 Binary files a/time-shutdown-1.1.1.tar.gz and /dev/null differ diff --git a/time-shutdown-1.1.2.tar.gz b/time-shutdown-1.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f147ff5a5118468740f847e0eb6879a657774758 Binary files /dev/null and b/time-shutdown-1.1.2.tar.gz differ diff --git a/time-shutdown.spec b/time-shutdown.spec index a738773052f2f9ef7388a1b884ed403dd1efe454..69cf07c117b3132e83ab34343ae5ead095d7c185 100644 --- a/time-shutdown.spec +++ b/time-shutdown.spec @@ -1,6 +1,6 @@ Name: time-shutdown -Version: 1.1.1 -Release: 3 +Version: 1.1.2 +Release: 1 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 -patch1: 0002-add-header-file.patch +Patch0: add_desktop_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 -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -50,13 +47,20 @@ popd %{_datadir}/applications/ukui-time-shotdown.desktop %{_datadir}/glib-2.0/schemas/org.ukui.time.shutdown.settings.gschema.xml %{_datadir}/ukui-time-shutdown/time-shutdown_zh_CN.qm +%{_datadir}/ukui-time-shutdown/ukui-time-shutdown_bo_CN.qm %changelog +* Fri Nov 25 2022 douyan - 1.1.2-1 +- update to upstream version 1.1.2 + +* Fri Mar 4 2022 douyan - 1.1.1-4 +- update to upstream version 1.1.1 + * Thu Feb 10 2022 tanyulong - 1.1.1-3 - fix missing head file error * Tue Dec 1 2020 douyan - 1.1.1-2 - fix-title-bar-issue -* Wen Nov 11 2020 douyan - 1.1.1-1 +* Wed Nov 11 2020 douyan - 1.1.1-1 - update to upstream version 1.1.0-1-0001+1031