[cryptsetup/f21] fix license handling
Tom Callaway
spot at fedoraproject.org
Fri Jul 11 21:08:41 UTC 2014
commit 112bc8a3996284e3c039fb6d24ed048dfde970cc
Author: Tom Callaway <spot at fedoraproject.org>
Date: Fri Jul 11 17:08:59 2014 -0400
fix license handling
cryptsetup.spec | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b52b723..44ed703 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -3,7 +3,7 @@
Summary: A utility for setting up encrypted disks
Name: cryptsetup
Version: 1.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/System
URL: http://cryptsetup.googlecode.com/
@@ -133,17 +133,22 @@ popd
%postun -n cryptsetup-libs -p /sbin/ldconfig
%files
-%doc COPYING AUTHORS FAQ docs/*ReleaseNotes
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS FAQ docs/*ReleaseNotes
%{_mandir}/man8/cryptsetup.8.gz
%{_sbindir}/cryptsetup
%files -n veritysetup
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
%{_mandir}/man8/veritysetup.8.gz
%{_sbindir}/veritysetup
%files reencrypt
-%doc COPYING misc/dracut_90reencrypt
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc misc/dracut_90reencrypt
%{_mandir}/man8/cryptsetup-reencrypt.8.gz
%{_sbindir}/cryptsetup-reencrypt
@@ -154,23 +159,31 @@ popd
%{_libdir}/pkgconfig/libcryptsetup.pc
%files libs -f cryptsetup.lang
-%doc COPYING COPYING.LGPL
+%{!?_licensedir:%global license %%doc}
+%license COPYING COPYING.LGPL
%{_libdir}/libcryptsetup.so.*
%{_libdir}/fipscheck/libcryptsetup.so.*.hmac
%files python
-%doc COPYING.LGPL python/pycryptsetup-test.py
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LGPL
+%doc python/pycryptsetup-test.py
%exclude %{python_sitearch}/pycryptsetup.la
%{python_sitearch}/pycryptsetup.so
%files python3
-%doc COPYING.LGPL python/pycryptsetup-test.py
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LGPL
+%doc python/pycryptsetup-test.py
%exclude %{python3_sitearch}/pycryptsetup.la
%{python3_sitearch}/pycryptsetup.so
%clean
%changelog
+* Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 1.6.5-2
+- fix license handling
+
* Sun Jun 29 2014 Milan Broz <gmazyland at gmail.com> - 1.6.5-1
- Update to cryptsetup 1.6.5.
- Add cryptsetup-python3 subpackage.
More information about the scm-commits
mailing list