From 178e9783e93071c5573934b356a744db87210fd8b8c56db1cfd0f726c8095f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 May 2020 07:39:12 +0000 Subject: [PATCH] Accepting request 808905 from home:coolo:branches:openSUSE:Factory - Fix license entry of the library - it's different than the rest OBS-URL: https://build.opensuse.org/request/show/808905 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libidn2?expand=0&rev=33 --- libidn2.changes | 5 +++++ libidn2.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libidn2.changes b/libidn2.changes index 18ffb75..1405854 100644 --- a/libidn2.changes +++ b/libidn2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 26 06:14:55 UTC 2020 - Stephan Kulow + +- Fix license entry of the library - it's different than the rest + ------------------------------------------------------------------- Sat Feb 22 19:14:28 UTC 2020 - Bjørn Lie diff --git a/libidn2.spec b/libidn2.spec index 39c4137..8101c66 100644 --- a/libidn2.spec +++ b/libidn2.spec @@ -1,7 +1,7 @@ # # spec file for package libidn2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: libidn2 Version: 2.3.0 Release: 0 Summary: Support for Internationalized Domain Names (IDN) based on IDNA2008 -License: GPL-3.0-or-later +License: GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later) URL: https://www.gnu.org/software/libidn/#libidn2 Source0: https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz.sig @@ -34,6 +34,7 @@ An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893) %package tools Summary: Command line utility to convert Int. Domain Names +License: GPL-3.0-or-later Requires(post): %{install_info_prereq} %description tools @@ -42,6 +43,7 @@ An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893) %package -n %{lname} Summary: Support for Internationalized Domain Names (IDN) # for lang package +License: GPL-2.0-or-later OR LGPL-3.0-or-later Provides: %{name} = %{version} %description -n %{lname} @@ -49,6 +51,7 @@ An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893) %package devel Summary: Include Files and Libraries mandatory for Development +License: GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later) Requires: %{lname} = %{version} %description devel