From 701eed422d3b0d3c0608915fdc506f1fc218d704277e8258a23d1599e740dc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Dec 2024 10:56:56 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main os-update revision 20a9c30ca32b9e41ac1e4a7abe6e1a97 --- _service | 15 ++++++++++ _servicedata | 5 ++++ os-update-1.15.tar.xz | 3 -- os-update-1.20+git.20241204.tar.xz | 3 ++ os-update.changes | 44 ++++++++++++++++++++++++++++++ os-update.spec | 25 +++++++++-------- 6 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 os-update-1.15.tar.xz create mode 100644 os-update-1.20+git.20241204.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..0040d51 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://github.com/openSUSE/os-update.git + git + main + enable + os-update + 1.20+git.%cd + + + *.tar + xz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..b2a54b1 --- /dev/null +++ b/_servicedata @@ -0,0 +1,5 @@ + + + https://github.com/openSUSE/os-update.git +3e61544bd8bc6625f3f5cca5abd8f9d439ae4bf4 + \ No newline at end of file diff --git a/os-update-1.15.tar.xz b/os-update-1.15.tar.xz deleted file mode 100644 index e17e10d..0000000 --- a/os-update-1.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16daec14f10f9e3307afd92eabd27d7b21ba1f2b91a0a23a6a3aa79263236ec9 -size 59976 diff --git a/os-update-1.20+git.20241204.tar.xz b/os-update-1.20+git.20241204.tar.xz new file mode 100644 index 0000000..8c1f23a --- /dev/null +++ b/os-update-1.20+git.20241204.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50b99797fe253118705f0cea22590b0b8320e065f67102f097abd273ff6934be +size 13608 diff --git a/os-update.changes b/os-update.changes index dbc1c90..595fe0d 100644 --- a/os-update.changes +++ b/os-update.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Wed Dec 04 10:39:14 UTC 2024 - kukuk@suse.com + +- Update to version 1.20+git.20241204: + * Release version 1.20 + * Switch from pandoc to go-md2man + * Add option to ignore services at all + +------------------------------------------------------------------- +Mon Nov 11 10:51:57 UTC 2024 - kukuk@suse.com + +- Update to version 1.19+git.20241111: + * Release version 1.19 + * Only provide application defaults as comments + * Don't try to restart dbus-broker, use soft-reboot + * Don't hardcode path of rebootmgrctl + +------------------------------------------------------------------- +Wed Nov 06 10:24:35 UTC 2024 - kukuk@suse.com + +- Update to version 1.18+git.20241106: + * Release version 1.18 + * Move vendor config to /usr/share/os-update + * Unify indentation style + +------------------------------------------------------------------- +Mon Oct 07 12:12:34 UTC 2024 - kukuk@suse.com + +- Update to version 1.17+git.20241007: + * Refresh before dup + * Always refresh + +------------------------------------------------------------------- +Wed May 8 12:48:41 UTC 2024 - Thorsten Kukuk + +- Update to version 1.17 + - Implement soft-reboot support for non restartable services + +------------------------------------------------------------------- +Mon Mar 11 10:57:41 UTC 2024 - Thorsten Kukuk + +- Update to version 1.16 + - Enhance logging for soft-reboot tracking + ------------------------------------------------------------------- Thu Jan 18 16:12:32 UTC 2024 - Thorsten Kukuk diff --git a/os-update.spec b/os-update.spec index 83474d5..796fdca 100644 --- a/os-update.spec +++ b/os-update.spec @@ -21,27 +21,30 @@ %endif Name: os-update -Version: 1.15 +Version: 1.20+git.20241204 Release: 0 Summary: Updates the system regularly to stay current and safe License: GPL-2.0-or-later URL: https://github.com/openSUSE/os-update -Source: https://github.com/openSUSE/os-update/releases/download/v%{version}/os-update-%{version}.tar.xz +Source: os-update-%{version}.tar.xz Source99: os-update-rpmlintrc +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: go-md2man BuildRequires: pkgconfig BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildRequires: pkgconfig(systemd) Requires: lsof +Recommends: rebootmgr +Recommends: systemd-status-mail +BuildArch: noarch %if 0%{?suse_version} >= 1500 Requires: zypper-needs-restarting %endif %if 0%{?suse_version} >= 1600 Requires: zypp-boot-plugin >= 0.0.4 %endif -Recommends: rebootmgr -Recommends: systemd-status-mail -BuildArch: noarch %description Service to keep an OS update to date and secure. It is run by a @@ -50,13 +53,13 @@ requires a reboot. %package -n systemd-status-mail Summary: Send a mail if a systemd.timer fails and/or succeeds +%sysusers_requires %if 0%{?suse_version} >= 1500 Requires: (/usr/sbin/sendmail or mailx) Suggests: mailx %else Requires: mailx %endif -%sysusers_requires %description -n systemd-status-mail systemd-mail-status is called by systemd-status-mail@.service if the @@ -69,7 +72,8 @@ of the service, the hostname and the output of %setup -q %build -%configure --enable-vendordir=%{_distconfdir} +./autogen.sh +%configure %if 0%{?suse_version} < 1500 %define make_build %{__make} -O %{?_smp_mflags} %endif @@ -97,11 +101,8 @@ install -m 644 -D etc/default/systemd-status-mail %{buildroot}%{_distconfdir}/de %files %license COPYING %doc README.md -%if 0%{?suse_version} < 1550 -%config(noreplace) %{_sysconfdir}/os-update.conf -%else -%{_distconfdir}/os-update.conf -%endif +%dir %{_datadir}/os-update +%{_datadir}/os-update/os-update.conf %{_libexecdir}/os-update %{_prefix}/lib/systemd/system/os-update.service %{_prefix}/lib/systemd/system/os-update.timer