From 8a6dd5c245b446381ba359190cfb0d4d9715fc8b Mon Sep 17 00:00:00 2001 From: tanyulong2021 Date: Fri, 29 Oct 2021 11:08:31 +0800 Subject: [PATCH] remove in debian copyright file --- 0004-remove-in-debian-copyright-file.patch | 24 ++++++++++++++++++++++ ukui-screensaver.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0004-remove-in-debian-copyright-file.patch diff --git a/0004-remove-in-debian-copyright-file.patch b/0004-remove-in-debian-copyright-file.patch new file mode 100644 index 0000000..b4d9ff9 --- /dev/null +++ b/0004-remove-in-debian-copyright-file.patch @@ -0,0 +1,24 @@ +From 47cd0361ea8f29ad2a92ad280f1882087af3e547 Mon Sep 17 00:00:00 2001 +From: tanyulong +Date: Fri, 29 Oct 2021 11:04:43 +0800 +Subject: [PATCH] remove in debian copyright file + +--- + debian/copyright | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/debian/copyright b/debian/copyright +index 9920bbb..a79795b 100755 +--- a/debian/copyright ++++ b/debian/copyright +@@ -10,7 +10,6 @@ Files: CMakeLists.txt + debian/* + screensaver/* + Common/* +- .gitmodules + Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd. + License: GPL-3+ + +-- +2.30.0 + diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index 6193c58..c687ea8 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,6 +1,6 @@ Name: ukui-screensaver Version: 3.0.1 -Release: 4 +Release: 5 Summary: parallels toolbox for UKUI License: GPL-3+ GPL-2+ URL: http://www.ukui.org @@ -29,6 +29,7 @@ Requires: dconf-devel patch0: 0001-fix-icon-misplaced.patch patch1: 0002-fix-ukui-screensaver-dialog-lock.patch patch2: 0003-Fix-a-return-type-error.patch +patch3: 0004-remove-in-debian-copyright-file.patch %description The ukui-sidebar is mainly used in the desktop operating system. @@ -41,6 +42,7 @@ patch2: 0003-Fix-a-return-type-error.patch %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cmake . @@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT #%%{_datadir}/ukui-screensaver/screensaver-en.ini %changelog +* Fri Oct 29 2021 tanyulong - 3.0.1-5 +- No the file .gitmodules,so remove in debian/copyright file + * Thu Oct 28 2021 tanyulong - 3.0.1-4 - Fix a return type error