SHA256
1
0
forked from pool/kirigami2

- 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
This commit is contained in:
Fabian Vogt 2017-01-23 11:23:51 +00:00 committed by Git OBS Bridge
parent edbb8d21de
commit ba5e17b94a
3 changed files with 68 additions and 0 deletions

59
fix-license.patch Normal file
View File

@ -0,0 +1,59 @@
From bfadb7138e071764e7a259c877dec9d93061c564 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
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 <mart@kde.org> *
- * *
- * 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 <mart@kde.org>
+ * Copyright 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
+ *
+ * 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

View File

@ -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 Tue Dec 13 16:36:15 UTC 2016 - fabian@ritter-vogt.de

View File

@ -25,6 +25,8 @@ License: LGPL-2.1+
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Url: http://www.kde.org/ Url: http://www.kde.org/
Source: http://download.kde.org/stable/kirigami/%{name}-%{version}.tar.xz 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: extra-cmake-modules >= 0.0.8
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5Declarative) BuildRequires: cmake(KF5Declarative)
@ -61,6 +63,7 @@ Development files.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build