diff --git a/0001-modify-conflict.patch b/0001-modify-conflict.patch deleted file mode 100644 index 1512852..0000000 --- a/0001-modify-conflict.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 82fdf83f15f36424fd1007cd9bf2bf08a10d47e4 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Mon, 8 Nov 2021 16:03:01 +0800 -Subject: [PATCH] modify conflict - ---- - debian/changelog | 11 +++-------- - debian/source/format | 2 +- - src/plugins/ukui-clock/setAlarmRepeatDialog.cpp | 1 + - src/plugins/ukui-clock/setupPage.cpp | 1 + - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/debian/changelog b/debian/changelog -index 5e0a915..229ff30 100755 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,11 +1,6 @@ --ukui-sidebar (1.1.2-0001) v101; urgency=medium -- -- * New upstream bugfix release: -- - Add vnc support -- - Update Code specification -- - Add relay libxtst-dev -- - Delete the feedback widget -- -- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 -+ * New upstream release. -+ -+-- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 - - ukui-sidebar (3.0.0-1+1103) focal; urgency=medium - -diff --git a/debian/source/format b/debian/source/format -index 89ae9db..163aaf8 100755 ---- a/debian/source/format -+++ b/debian/source/format -@@ -1 +1 @@ --3.0 (native) -+3.0 (quilt) -diff --git a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp -index cf7be2c..0f3b7de 100755 ---- a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp -+++ b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); - -diff --git a/src/plugins/ukui-clock/setupPage.cpp b/src/plugins/ukui-clock/setupPage.cpp -index ff8cca3..a6e1091 100755 ---- a/src/plugins/ukui-clock/setupPage.cpp -+++ b/src/plugins/ukui-clock/setupPage.cpp -@@ -22,6 +22,7 @@ - #include "setAlarmRepeatDialog.h" - #include - #include -+#include - #include "customStyle.h" - - extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); --- -2.30.0 - diff --git a/0002-add-changlog.patch b/0002-add-changlog.patch deleted file mode 100644 index aef525c..0000000 --- a/0002-add-changlog.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7ce5a75e54397994fd99b7315b1876e3bb3d6a31 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Tue, 2 Nov 2021 10:23:26 +0800 -Subject: [PATCH] add changlog - ---- - debian/changelog | 9 +++++++++ - debian/files | 1 + - 2 files changed, 10 insertions(+) - create mode 100644 debian/files - -diff --git a/debian/changelog b/debian/changelog -index a011ebe..5e0a915 100755 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,12 @@ -+ukui-sidebar (1.1.2-0001) v101; urgency=medium -+ -+ * New upstream bugfix release: -+ - Add vnc support -+ - Update Code specification -+ - Add relay libxtst-dev -+ - Delete the feedback widget -+ -- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 -+ - ukui-sidebar (3.0.0-1+1103) focal; urgency=medium - - * Daily build. -diff --git a/debian/files b/debian/files -new file mode 100644 -index 0000000..7869f1b ---- /dev/null -+++ b/debian/files -@@ -0,0 +1 @@ -+ukui-sidebar_1.1.2-0001_source.buildinfo x11 optional --- -2.30.0 - diff --git a/0003-remove-junk-files.patch b/0003-remove-junk-files.patch deleted file mode 100644 index 8e28647..0000000 --- a/0003-remove-junk-files.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9a1d6bebfb91d43460f78d866e62e93d3b2242a3 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Wed, 10 Nov 2021 09:34:33 +0800 -Subject: [PATCH] remove junk files - ---- - translations/ukui-sidebar_bo.ts | 53 --------------------------------- - 1 file changed, 53 deletions(-) - delete mode 100755 translations/ukui-sidebar_bo.ts - -diff --git a/translations/ukui-sidebar_bo.ts b/translations/ukui-sidebar_bo.ts -deleted file mode 100755 -index 3f36355..0000000 ---- a/translations/ukui-sidebar_bo.ts -+++ /dev/null -@@ -1,53 +0,0 @@ -- -- -- -- -- QObject -- -- -- Display debug information -- -- -- -- -- Open -- -- -- -- -- Set up notification center -- -- -- -- -- 折叠 -- -- -- -- -- 展开 -- -- -- -- -- Widget -- -- -- Sidebar -- -- -- -- -- sidebarPluginsWidgets -- -- -- Clipboard -- -- -- -- -- Plugins -- -- -- -- --- -2.30.0 - diff --git a/0004-modify-and-update-changelog.patch b/0004-modify-and-update-changelog.patch deleted file mode 100644 index 99f8fe0..0000000 --- a/0004-modify-and-update-changelog.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bc6db5582d1d360eb44f049090b8288be4dc2f91 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Fri, 3 Dec 2021 10:39:13 +0800 -Subject: [PATCH] modify and update changelog - ---- - debian/changelog | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/debian/changelog b/debian/changelog -index 229ff30..d5d1fdf 100755 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,4 +1,11 @@ -- * New upstream release. -+ukui-sidebar (1.1.2-0008) v101; urgency=medium -+ -+ * 改动： -+ - 删除对于屏幕宽度判断，自适应屏幕缩放比200% -+ - 避免重复new 华为dbus接口 -+ -- liushanwen Thu, 01 Apr 2021 11:34:40+0800 -+ -+* New upstream release. - - -- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 - --- -2.30.0 - diff --git a/ukui-sidebar-3.0.1.tar.gz b/ukui-sidebar-3.0.1.tar.gz index 5bd9de6..0f8646f 100644 Binary files a/ukui-sidebar-3.0.1.tar.gz and b/ukui-sidebar-3.0.1.tar.gz differ diff --git a/ukui-sidebar.spec b/ukui-sidebar.spec index f01e6dc..291b529 100644 --- a/ukui-sidebar.spec +++ b/ukui-sidebar.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-sidebar Version: 3.0.1 -Release: 5 +Release: 6 Summary: parallels toolbox for UKUI License: GPL-3+ URL: http://www.ukui.org @@ -26,11 +26,6 @@ Requires: qt5-qttools-devel Requires: gsettings-qt-devel Requires: dconf-devel -#patch0: fix-plugin-icon.patch -patch1: 0002-add-changlog.patch -patch2: 0001-modify-conflict.patch -patch3: 0003-remove-junk-files.patch -patch4: 0004-modify-and-update-changelog.patch %description The ukui-sidebar is mainly used in the desktop operating system. @@ -40,11 +35,6 @@ patch4: 0004-modify-and-update-changelog.patch %prep %setup -q -#%%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build mkdir build && cd build @@ -89,6 +79,9 @@ done %{_datadir}/ukui-clock/ %changelog +* Tue Dec 07 2021 huayadong - 3.0.1-6 +- update to upstream version 3.0.0-1+1107 + * Fri Dec 03 2021 tanyulong - 3.0.1-5 - modify and update changelog