From d8018f71b301d18254cacd4e0502448b23f1318e9219aa00816397ec7fb8c3bf Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 9 Apr 2018 09:41:22 +0000 Subject: [PATCH] Accepting request 593416 from home:kukuk:branches:Base:System - Use %license instead of %doc [bsc#1082318] OBS-URL: https://build.opensuse.org/request/show/593416 OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=85 --- tar.changes | 5 +++++ tar.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tar.changes b/tar.changes index 8b5afdb..adb1de7 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 3 14:58:19 CEST 2018 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Thu Jan 4 13:24:20 UTC 2018 - kstreitova@suse.com diff --git a/tar.spec b/tar.spec index 6306c64..7be053c 100644 --- a/tar.spec +++ b/tar.spec @@ -22,7 +22,7 @@ Name: tar Version: 1.30 Release: 0 Summary: GNU implementation of ((t)ape (ar)chiver) -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Archiving/Backup Url: https://www.gnu.org/software/tar/ Source0: https://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2 @@ -152,7 +152,7 @@ install -D -m 644 scripts/backup-specs %{buildroot}%{_sysconfdir}/backup/backup- mv %{buildroot}%{_sbindir}/restore %{buildroot}%{_sbindir}/restore.sh rm -f %{buildroot}%{_infodir}/dir install -D -m 644 -t %{buildroot}%{_docdir}/%{name} README* ABOUT-NLS AUTHORS NEWS THANKS \ - ChangeLog TODO COPYING + ChangeLog TODO install -d -m 755 %{buildroot}%{_localstatedir}/lib/tests cp -r tests %{buildroot}%{_localstatedir}/lib/tests/tar rm %{buildroot}%{_localstatedir}/lib/tests/tar/*.{c,h,o} @@ -207,6 +207,7 @@ fi %ghost %{_sysconfdir}/alternatives/rmt.1%{ext_man} %files doc +%dir %{_docdir}/%{name} %{_docdir}/%{name}/NEWS %{_docdir}/%{name}/README %{_docdir}/%{name}/ABOUT-NLS @@ -217,12 +218,11 @@ fi %{_infodir}/%{name}.info* %files +%license COPYING #UsrMerge /bin/%{name} #EndUsrMerge %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{ext_man} -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/COPYING %changelog