From deca7dd12c9a7c39dce2b2131a5669a50cad74c0 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 17 Nov 2017 14:52:37 +0900 Subject: [PATCH] Add dependency to the device-mapper package and License fix Change-Id: Iaa014c33594f250ac28b8969c6fbcb782e4e3367 Signed-off-by: Hyotaek Shim --- COPYING => COPYING.GPL-2.0+ | 0 COPYING.LGPL => COPYING.LGPL-2.1+ | 0 packaging/cryptsetup.spec | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) rename COPYING => COPYING.GPL-2.0+ (100%) rename COPYING.LGPL => COPYING.LGPL-2.1+ (100%) diff --git a/COPYING b/COPYING.GPL-2.0+ similarity index 100% rename from COPYING rename to COPYING.GPL-2.0+ diff --git a/COPYING.LGPL b/COPYING.LGPL-2.1+ similarity index 100% rename from COPYING.LGPL rename to COPYING.LGPL-2.1+ diff --git a/packaging/cryptsetup.spec b/packaging/cryptsetup.spec index 8704e7a..38e5645 100644 --- a/packaging/cryptsetup.spec +++ b/packaging/cryptsetup.spec @@ -2,7 +2,7 @@ Name: cryptsetup Summary: The cryptsetup Version: 1.6.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 @@ -19,7 +19,7 @@ BuildRequires: automake BuildRequires: gettext Requires: libgpg-error -Requires: libdevmapper +Requires: device-mapper Requires: libgcrypt %description @@ -75,7 +75,7 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/binary_package_name.manifest %files %defattr(-,root,root,-) %manifest %{_datadir}/binary_package_name.manifest -%license COPYING +%license COPYING.GPL-2.0+ %{_libdir}/libcryptsetup.so %{_libdir}/libcryptsetup.so.4 %{_libdir}/libcryptsetup.so.4.7.0 @@ -83,11 +83,13 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/binary_package_name.manifest %{_sbindir}/veritysetup %files devel +%license COPYING.LGPL-2.1+ %{_includedir}/libcryptsetup.h %{_libdir}/libcryptsetup.so %{_libdir}/pkgconfig/libcryptsetup.pc %files locale +%license COPYING.GPL-2.0+ %{_datarootdir}/locale/cs/LC_MESSAGES/cryptsetup.mo %{_datarootdir}/locale/de/LC_MESSAGES/cryptsetup.mo %{_datarootdir}/locale/fi/LC_MESSAGES/cryptsetup.mo @@ -102,5 +104,6 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/binary_package_name.manifest %{_datarootdir}/locale/es/LC_MESSAGES/cryptsetup.mo %files doc +%license COPYING.GPL-2.0+ %{_mandir}/man8/cryptsetup.8.gz %{_mandir}/man8/veritysetup.8.gz -- 2.7.4