From ba5e17b94a6d5a7e359baabc1c63cb577f4fa555d245ebb9e4cf2497b6a01142 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 23 Jan 2017 11:23:51 +0000 Subject: [PATCH] - Add upstream patch to fix licensing issues (kde#375344): * fix-license.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=5 --- fix-license.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++ kirigami2.changes | 6 +++++ kirigami2.spec | 3 +++ 3 files changed, 68 insertions(+) create mode 100644 fix-license.patch diff --git a/fix-license.patch b/fix-license.patch new file mode 100644 index 0000000..a30f6b2 --- /dev/null +++ b/fix-license.patch @@ -0,0 +1,59 @@ +From bfadb7138e071764e7a259c877dec9d93061c564 Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Mon, 23 Jan 2017 11:58:34 +0100 +Subject: fix license header + +BUG:375344 +--- + src/desktopicon.h | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +diff --git a/src/desktopicon.h b/src/desktopicon.h +index 7c02a7d..a6bd5f1 100644 +--- a/src/desktopicon.h ++++ b/src/desktopicon.h +@@ -1,21 +1,23 @@ +-/*************************************************************************** +- * Copyright 2011 Marco Martin * +- * * +- * 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 2 of the License, or * +- * (at your option) any later version. * +- * * +- * This program 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. * +- * * +- * You should have received a copy of the GNU General Public License * +- * along with this program; if not, write to the * +- * Free Software Foundation, Inc., * +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * +- ***************************************************************************/ ++/* ++ * Copyright 2011 Marco Martin ++ * Copyright 2014 Aleix Pol Gonzalez ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2, or ++ * (at your option) any later version. ++ * ++ * This program 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 ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ + #ifndef QICONITEM_H + #define QICONITEM_H + +-- +cgit v0.11.2 + diff --git a/kirigami2.changes b/kirigami2.changes index 9396af1..794d6f8 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 23 11:23:29 UTC 2017 - fabian@ritter-vogt.de + +- Add upstream patch to fix licensing issues (kde#375344): + * fix-license.patch + ------------------------------------------------------------------- Tue Dec 13 16:36:15 UTC 2016 - fabian@ritter-vogt.de diff --git a/kirigami2.spec b/kirigami2.spec index c466c35..32fe528 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -25,6 +25,8 @@ License: LGPL-2.1+ Group: Development/Libraries/KDE Url: http://www.kde.org/ Source: http://download.kde.org/stable/kirigami/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-license.patch notmart@gmail.com -- fix license header +Patch1: fix-license.patch BuildRequires: extra-cmake-modules >= 0.0.8 BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Declarative) @@ -61,6 +63,7 @@ Development files. %prep %setup -q +%patch1 -p1 %build %cmake_kf5 -d build