[lvm2] fix license handling

Tom Callaway spot at fedoraproject.org
Fri Jul 18 20:04:22 UTC 2014


commit 7f8f4a55c53b462677ebb8fe884c1b56001c8bd8
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Jul 18 16:04:47 2014 -0400

    fix license handling

 lvm2.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index 0f41459..50eb869 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -40,7 +40,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.107
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -157,7 +157,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README VERSION WHATS_NEW
+%{!?_licensedir:%global license %%doc}
+%license COPYING COPYING.LIB
+%doc README VERSION WHATS_NEW
 %doc doc/lvm_fault_handling.txt
 
 # Main binaries
@@ -337,6 +339,8 @@ This package contains shared lvm2 libraries for applications.
 
 %files libs
 %defattr(555,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
 %{_libdir}/liblvm2app.so.*
 %{_libdir}/liblvm2cmd.so.*
 %{_libdir}/libdevmapper-event-lvm2.so.*
@@ -516,7 +520,9 @@ for the kernel device-mapper.
 
 %files -n device-mapper
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README
+%{!?_licensedir:%global license %%doc}
+%license COPYING COPYING.LIB
+%doc WHATS_NEW_DM VERSION_DM README
 %doc udev/12-dm-permissions.rules
 %defattr(444,root,root,-)
 %attr(555, -, -) %{_sbindir}/dmsetup
@@ -559,6 +565,8 @@ This package contains the device-mapper shared library, libdevmapper.
 
 %files -n device-mapper-libs
 %defattr(555,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license COPYING COPYING.LIB
 %{_libdir}/libdevmapper.so.*
 
 %package -n device-mapper-event
@@ -607,6 +615,8 @@ libdevmapper-event.
 
 %files -n device-mapper-event-libs
 %defattr(555,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
 %{_libdir}/libdevmapper-event.so.*
 
 %package -n device-mapper-event-devel
@@ -628,6 +638,9 @@ the device-mapper event library.
 %{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Fri Jul 18 2014 Tom Callaway <spot at fedoraproject.org> - 2.02.107-2
+- fix license handling
+
 * Tue Jun 24 2014 Peter Rajnoha <prajnoha at redhat.com> - 2.02.107-1
 - Add cmirror-standalone subpackage containing new lvm2-cmirrord.service
   systemd unit for standalone cmirrord daemon management without cluster


More information about the scm-commits mailing list