[xz] fix license handling

Tom Callaway spot at fedoraproject.org
Wed Aug 6 11:50:52 UTC 2014


commit b40d96962bb94d647c6cb06e7f182bb1deef63da
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Aug 6 13:50:47 2014 +0200

    fix license handling

 xz.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/xz.spec b/xz.spec
index 8868d01..2c8eff8 100644
--- a/xz.spec
+++ b/xz.spec
@@ -3,7 +3,7 @@
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	5.1.2
-Release:	12alpha%{?dist}
+Release:	13alpha%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # official upstream release
@@ -150,24 +150,29 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING* NEWS README THANKS TODO
+%{!?_licensedir:%global license %%doc}
+%license COPYING*
+%doc AUTHORS NEWS README THANKS TODO
 %{_bindir}/*xz*
 %{_mandir}/man1/*xz*
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYING*
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/lib*.so.5*
 
 %files static
 %defattr(-,root,root,-)
-%doc COPYING*
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %{_libdir}/liblzma.a
 
 %files compat-libs
 %defattr(-,root,root,-)
-%doc COPYING*
-%{_libdir}/lib*.so.0*
+%{!?_licensedir:%global license %%doc}
+%license COPYING*
+%doc COPYING* %{_libdir}/lib*.so.0*
 
 %files devel
 %defattr(-,root,root,-)
@@ -183,6 +188,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*lz*
 
 %changelog
+* Wed Aug  6 2014 Tom Callaway <spot at fedoraproject.org> - 5.1.2-13alpha
+- fix license handling
+
 * Fri Jun 13 2014 Pavel Raiskup <praiskup at redhat.com> - 5.1.2-12alpha
 - xzgrep: return 0 when at least one file matches (#1109122)
 


More information about the scm-commits mailing list