diff --git a/xz.changes b/xz.changes index 4cc57ce..38384e2 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 15:41:58 CET 2018 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Mon Jul 10 10:50:01 UTC 2017 - jengelh@inai.de diff --git a/xz.spec b/xz.spec index 93d147a..5360032 100644 --- a/xz.spec +++ b/xz.spec @@ -1,7 +1,7 @@ # # spec file for package xz # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: xz Version: 5.2.3 Release: 0 Summary: A Program for Compressing Files with the Lempel–Ziv–Markov algorithm -License: LGPL-2.1+ AND GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Productivity/Archiving/Compression Url: http://tukaani.org/xz/ Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz @@ -115,6 +115,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1 +rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %post -n liblzma5 -p /sbin/ldconfig %postun -n liblzma5 -p /sbin/ldconfig @@ -126,6 +127,7 @@ install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1 %files %defattr(-, root, root) +%license COPYING COPYING.GPLv2 %{_docdir}/%{name} %{_bindir}/lzcat %{_bindir}/lzcmp