diff --git a/0001-update-copyright.patch b/0001-update-copyright.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f6cbafbc3a6b78d69a3c082c9696fbe3c65606c --- /dev/null +++ b/0001-update-copyright.patch @@ -0,0 +1,81 @@ +From 604becfa08696c89564d6884cf3f744f34c1c6df Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Wed, 20 Nov 2024 07:10:22 +0800 +Subject: [PATCH] update copyright + +--- + debian/copyright | 55 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 38 insertions(+), 17 deletions(-) + +diff --git a/debian/copyright b/debian/copyright +index 570391d..a68fec5 100644 +--- a/debian/copyright ++++ b/debian/copyright +@@ -4,26 +4,47 @@ Upstream-Contact: liuyuhui + Source: https://github.com/UbuntuKylin/kylin-weather + + Files: * +-Copyright: 2018, liuyuhui ++Copyright: 2023, KylinSoft Co., Ltd. + License: GPL-3.0+ + +-Files: debian/* +-Copyright: 2018, liuyuhui +-License: GPL-3.0+ ++Files: qtsingleapplication/* ++Copyright: 2013, Digia Plc and/or its subsidiary(-ies). ++License: BSD-3-clause + +-License: GPL-3.0+ +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation, either version 3 of the License, or +- (at your option) any later version. ++License: BSD-3-clause ++ The BSD License ++ . ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are ++ met: + . +- This package is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ * Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. + . +- You should have received a copy of the GNU General Public License +- along with this program. If not, see . ++ * Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. + . +- On Debian systems, the complete text of the GNU General +- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". ++ * Neither the name of the copyright holder nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. ++ . ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ++ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ++ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++License: GPL-3.0+ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; version 3 dated June, 2007, or (at ++ your option) any later version. ++ On Debian systems, the complete text of version 3 of the GNU General ++ Public License can be found in '/usr/share/common-licenses/GPL-3'. +-- +2.46.0 + diff --git a/kylin-weather.spec b/kylin-weather.spec index 8b34a5e3598b9bf9900a6cc8313437c96d7f0ea1..75c0fd74f433a9d19f7c8244d13eb3711e514d55 100644 --- a/kylin-weather.spec +++ b/kylin-weather.spec @@ -1,11 +1,13 @@ Name: kylin-weather Version: 3.2.0.3 -Release: 1 +Release: 2 Summary: Indicator that displays China weather information -License: GPL-3.0+ +License: GPL-3.0+ and BSD-3-clause URL: https://gitee.com/openkylin/kylin-weather Source0: %{name}-%{version}.tar.gz + Patch01: 0001-fix-compile-error-of-kylin-weather.patch +Patch02: 0001-update-copyright.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -33,6 +35,7 @@ change it. %prep %setup -q %patch01 -p1 +%patch02 -p1 %build mkdir build && pushd build @@ -67,6 +70,12 @@ fi %{_datadir}/kylin-user-guide/* %changelog +* Fri Nov 22 2024 huayadong - 3.2.0.3-2 +- Type:update +- CVE: +- SUG:NA +- DESC: add Patch02: 0001-update-copyright.patch + * Wed Apr 10 2024 peijiankang - 3.2.0.3-1 - update version to 3.2.0.3 from openkylin