From 855298b875e6390fa64ee687cb990fbb9061b02a188980148ae95e325d2efb1d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 26 Mar 2018 09:56:27 +0000 Subject: [PATCH] Accepting request 588603 from devel:CaaSP OBS-URL: https://build.opensuse.org/request/show/588603 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rebootmgr?expand=0&rev=8 --- rebootmgr.changes | 5 +++++ rebootmgr.spec | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/rebootmgr.changes b/rebootmgr.changes index ce438fa..65ba2c6 100644 --- a/rebootmgr.changes +++ b/rebootmgr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 12:00:31 CET 2018 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Wed Jan 10 10:08:21 CET 2018 - kukuk@suse.de diff --git a/rebootmgr.spec b/rebootmgr.spec index e84ea80..a49e056 100644 --- a/rebootmgr.spec +++ b/rebootmgr.spec @@ -20,9 +20,9 @@ Name: rebootmgr Version: 0.16 Release: 0 Summary: Automatic controlled reboot during a maintenance window -License: GPL-2.0 AND LGPL-2.1+ +License: GPL-2.0-only AND LGPL-2.1-or-later Group: System/Base -Url: https://github.com/SUSE/rebootmgr +URL: https://github.com/SUSE/rebootmgr Source: %{name}-%{version}.tar.bz2 BuildRequires: cetcd-devel BuildRequires: fdupes @@ -30,7 +30,6 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(json-c) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %description @@ -46,7 +45,7 @@ If you updated a system with e.g. transactional updates or a kernel update was a make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install ln -sf service %{buildroot}%{_sbindir}/rcrebootmgr %fdupes %{buildroot}%{_mandir} @@ -63,8 +62,8 @@ ln -sf service %{buildroot}%{_sbindir}/rcrebootmgr %service_del_postun rebootmgr.service %files -%defattr(-,root,root) -%doc NEWS COPYING COPYING.LIB +%license COPYING COPYING.LIB +%doc NEWS %dir %{_sysconfdir}/dbus-1/system.d %config %{_sysconfdir}/rebootmgr.conf %config %{_sysconfdir}/dbus-1/system.d/org.opensuse.RebootMgr.conf @@ -73,10 +72,10 @@ ln -sf service %{buildroot}%{_sbindir}/rcrebootmgr %{_sbindir}/rebootmgrd %{_sbindir}/rcrebootmgr %{_datadir}/dbus-1/interfaces/org.opensuse.RebootMgr.xml -%{_mandir}/man1/rebootmgrctl.1%{ext_man} -%{_mandir}/man5/rebootmgr.conf.5%{ext_man} -%{_mandir}/man8/rebootmgrd.8%{ext_man} -%{_mandir}/man8/org.opensuse.RebootMgr.conf.8%{ext_man} -%{_mandir}/man8/rebootmgr.service.8%{ext_man} +%{_mandir}/man1/rebootmgrctl.1%{?ext_man} +%{_mandir}/man5/rebootmgr.conf.5%{?ext_man} +%{_mandir}/man8/rebootmgrd.8%{?ext_man} +%{_mandir}/man8/org.opensuse.RebootMgr.conf.8%{?ext_man} +%{_mandir}/man8/rebootmgr.service.8%{?ext_man} %changelog