From: Karol Lewandowski <k.lewandowsk@samsung.com>
Date: Fri, 17 Feb 2023 13:59:54 +0000 (+0000)
Subject: Merge "Merge branch 'upstream' into tizen" into tizen
X-Git-Tag: accepted/tizen/unified/20230222.161516^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4c1cef5a4674eb873a551d4f2a492d985e55e1e;hp=0b3fd9f5cb35951953ebcff15cc0af7c50858ca9;p=platform%2Fupstream%2Fcryptsetup.git

Merge "Merge branch 'upstream' into tizen" into tizen
---

diff --git a/packaging/cryptsetup.spec b/packaging/cryptsetup.spec
index 0ebeaea..fe48bce 100644
--- a/packaging/cryptsetup.spec
+++ b/packaging/cryptsetup.spec
@@ -2,7 +2,7 @@ Name:     cryptsetup
 Summary:  The cryptsetup
 Version:  2.3.7
 Release:  1
-License:  GPL-2.0+
+License:  GPL-2.0+, LGPL-2.1+
 Group:    Base/Device Management
 URL:      http://code.google.com/p/cryptsetup/
 Source0:  %{name}-%{version}.tar.xz
@@ -31,14 +31,14 @@ setup cryptographic volumes for dm-crypt (including LUKS extension)
 %package devel
 Summary:    The cryptsetup development package
 Group:      Development/Libraries
-License:    GPL-2.0+
+License:    GPL-2.0+, LGPL-2.1+
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
 cryptsetup development package
 
 %package locale
-License:    GPL-2.0+
+License:    GPL-2.0+, LGPL-2.1+
 Summary:    The cryptsetup locale package
 Group:      Base/Device Management
 Requires:   %{name} = %{version}-%{release}
@@ -80,7 +80,7 @@ rm -rf %{buildroot}
 
 %files
 %manifest %{name}.manifest
-%license COPYING.GPL-2.0+
+%license COPYING.GPL-2.0+ COPYING.LGPL-2.1+
 %{_libdir}/libcryptsetup.so.*
 %{_prefix}/lib/tmpfiles.d/cryptsetup.conf
 %{_sbindir}/cryptsetup
@@ -88,14 +88,14 @@ rm -rf %{buildroot}
 
 %files devel
 %manifest %{name}.manifest
-%license COPYING.GPL-2.0+
+%license COPYING.GPL-2.0+ COPYING.LGPL-2.1+
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
 %{_libdir}/pkgconfig/libcryptsetup.pc
 
 %files locale
 %manifest %{name}.manifest
-%license COPYING.GPL-2.0+
+%license COPYING.GPL-2.0+ COPYING.LGPL-2.1+
 %{_datarootdir}/locale/cs/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/da/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/de/LC_MESSAGES/cryptsetup.mo