[X2Go-Commits] [x2goplasmabindings] 06/11: x2goplasmabindings.spec: fix License: tag, add COPYING and COPYING.GPL3 to either %license or %doc macros in %files section.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goplasmabindings.

commit d26ea57d4c79632e7736436b341b40dfa0c797f3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 29 22:21:52 2023 +0200

    x2goplasmabindings.spec: fix License: tag, add COPYING and COPYING.GPL3 to either %license or %doc macros in %files section.
---
 debian/changelog        |  2 ++
 x2goplasmabindings.spec | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70f5055..8f6695d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
     - /: add x2goplasmoidkf5.cpp, developed by Robert Tari, C++ part of a new
       KF5-based implementation.
     - /: add COPYING.GPL3.
+    - x2goplasmabindings.spec: fix License: tag, add COPYING and COPYING.GPL3
+      to either %license or %doc macros in %files section.
   * debian/control:
     + Adapt description to also mention KDE 5.
     + Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index 52dd4c5..4ee098a 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -15,11 +15,10 @@ Version:        3.0.2.3
 Release:        0.0x2go1%{?dist}
 %if 0%{?suse_version}
 Group:          Production/Network/Remote Desktop
-License:        GPL-2.0+
 %else
 Group:          Applications/Communications
-License:        GPLv2+
 %endif
+License:        LGPL-2.0-only AND GPL-3.0-only
 URL:            https://www.x2go.org
 Source0:        https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
@@ -141,6 +140,13 @@ fi
 
 %files -n plasma-addons-x2go
 %defattr(-,root,root)
+# This will also catch %%{?suse_version} == 0 (i.e., non-SuSE), which is what
+# we want. Hopefully.
+%if ( ! 0%{?suse_version} ) || 0%{?suse_version} >= 1500
+%license COPYING COPYING.GPL3
+%else
+%doc COPYING COPYING.GPL3
+%endif
 %doc debian/changelog
 %doc debian/copyright
 %dir %{_libdir}/kde4

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git