diff --git a/rebootmgr-0.18.tar.xz b/rebootmgr-0.18.tar.xz deleted file mode 100644 index 24dc1c8..0000000 --- a/rebootmgr-0.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6f430e00c7345d7ee2fbd7c3bd125e34169bcfe06447b7a4b024ba1c76d697f -size 199220 diff --git a/rebootmgr-0.20.tar.xz b/rebootmgr-0.20.tar.xz new file mode 100644 index 0000000..81c2d23 --- /dev/null +++ b/rebootmgr-0.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4e5bf32a7ddf6589b80b3f35ef29a2a8b6182b234a696a8b4bc11ee021acb25 +size 213148 diff --git a/rebootmgr.changes b/rebootmgr.changes index c2f856f..305a5ac 100644 --- a/rebootmgr.changes +++ b/rebootmgr.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Sep 9 10:40:46 CEST 2019 - kukuk@suse.de + +- Fix %config for backward compatibility + +------------------------------------------------------------------- +Fri Sep 6 13:03:15 CEST 2019 - kukuk@suse.de + +- Update to version 0.20 + - add support to write changes back to /etc/rebootmgr.conf + +------------------------------------------------------------------- +Wed Aug 28 12:56:07 CEST 2019 - kukuk@suse.de + +- Preserve /etc/rebootmgr.conf if modified + +------------------------------------------------------------------- +Tue Aug 27 15:17:28 CEST 2019 - kukuk@suse.de + +- Update to version 0.19 + - use libeconf for /usr/etc move + ------------------------------------------------------------------- Thu Jan 17 16:52:42 CET 2019 - kukuk@suse.de diff --git a/rebootmgr.spec b/rebootmgr.spec index 39e50f9..7751911 100644 --- a/rebootmgr.spec +++ b/rebootmgr.spec @@ -16,8 +16,15 @@ # +%if ! %{defined _distconfdir} + %define _distconfdir %{_sysconfdir} + %define with_config 1 +%else + %define with_config 0 +%endif + Name: rebootmgr -Version: 0.18 +Version: 0.20 Release: 0 Summary: Automatic controlled reboot during a maintenance window License: GPL-2.0-only AND LGPL-2.1-or-later @@ -30,7 +37,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(json-c) -%{?systemd_requires} +BuildRequires: pkgconfig(libeconf) %description RebootManager is a dbus service to execute a controlled reboot after updates in a defined maintenance window. @@ -47,10 +54,15 @@ make %{?_smp_mflags} %install %make_install ln -sf service %{buildroot}%{_sbindir}/rcrebootmgr +if [ ! -d %{buildroot}%{_distconfdir} ]; then + mkdir -p %{buildroot}%{_distconfdir} + mv %{buildroot}%{_sysconfdir}/rebootmgr.conf %{buildroot}%{_distconfdir} +fi %fdupes %{buildroot}%{_mandir} %pre %service_add_pre rebootmgr.service +test -f /etc/rebootmgr.conf.rpmsave && mv -v /etc/rebootmgr.conf.rpmsave /etc/rebootmgr.conf.rpmsave.old ||: %post %service_add_post rebootmgr.service @@ -61,11 +73,18 @@ ln -sf service %{buildroot}%{_sbindir}/rcrebootmgr %postun %service_del_postun rebootmgr.service +%posttrans +test -f /etc/rebootmgr.conf.rpmsave && mv -v /etc/rebootmgr.conf.rpmsave /etc/rebootmgr.conf + %files %license COPYING COPYING.LIB %doc NEWS %dir %{_sysconfdir}/dbus-1/system.d +%if %{with_config} %config %{_sysconfdir}/rebootmgr.conf +%else +%{_distconfdir}/rebootmgr.conf +%endif %config %{_sysconfdir}/dbus-1/system.d/org.opensuse.RebootMgr.conf %{_prefix}/lib/systemd/system/rebootmgr.service %{_sbindir}/rebootmgrctl