diff --git a/rsyslog.changes b/rsyslog.changes index c91709b..4c8eb1e 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 11:43:55 CET 2018 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Mon Feb 19 09:16:20 UTC 2018 - Thomas.Blume@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 8ad7654..283a96d 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -23,7 +23,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix -License: (GPL-3.0+ and Apache-2.0) +License: (GPL-3.0-or-later AND Apache-2.0) Group: System/Daemons Version: 8.32.0 Release: 0 @@ -772,7 +772,7 @@ install -m0600 %{_sourcedir}/rsyslog.sysconfig \ # rm -f doc/Makefile* install -d -m0755 %{buildroot}%{rsyslogdocdir}/html/ -find ChangeLog README AUTHORS COPYING* \ +find ChangeLog README AUTHORS \ \( -type d -exec install -m755 -d %{buildroot}%{rsyslogdocdir}/\{\} \; \) \ -o \( -type f -exec install -m644 \{\} %{buildroot}%{rsyslogdocdir}/\{\} \; \) cp -av build/* %{buildroot}%{rsyslogdocdir}/html/ @@ -992,11 +992,11 @@ fi %dir %{rsyslog_module_dir_withdeps} %{_mandir}/man5/rsyslog.conf.5* %{_mandir}/man8/rsyslogd.8* +%license COPYING COPYING.ASL20 COPYING.LESSER %dir %{rsyslogdocdir} %doc %{rsyslogdocdir}/ChangeLog %doc %{rsyslogdocdir}/README %doc %{rsyslogdocdir}/AUTHORS -%doc %{rsyslogdocdir}/COPYING* %dir %{_localstatedir}/spool/rsyslog %{_fillupdir}/sysconfig.syslog-rsyslog %attr(0755,root,root) %dir %ghost %{rsyslog_rundir}