pool/rsyslog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1139742 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1139742
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=176
This commit is contained in:
Ana Guerrero 2024-01-19 22:00:10 +00:00 committed by Git OBS Bridge
commit a21b8ed569
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rsyslog.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 18 14:04:41 UTC 2024 - Thomas Blume <thomas.blume@suse.com>
- suppress installation errors when systemd is not running
(bsc#1218799)
-------------------------------------------------------------------
Wed Oct 25 08:27:13 UTC 2023 - Thomas Blume <thomas.blume@suse.com>

14
rsyslog.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package rsyslog
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,11 +22,13 @@
%endif
%define mark_daemon_restart %if 0%{?suse_version} > 1550 \
/usr/lib/systemd/systemd-update-helper mark-restart-system-units rsyslog.service \
/usr/lib/systemd/systemd-update-helper mark-restart-system-units rsyslog.service ||: \
%else \
/usr/bin/systemctl set-property "rsyslog.service" Markers=+needs-restart \
/usr/bin/systemctl set-property "rsyslog.service" Markers=+needs-restart ||: \
%endif
%define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
# drop this with next release when doc tarball version lines up
%define rsyslog_major 8.2306
%define rsyslog_patch 0
@ -397,6 +399,8 @@ Requires: %{name} = %{version}
Summary: RELP protocol support module for syslog
Group: System/Daemons
%requires_file %{_libdir}/librelp.so
%description module-relp
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
package.
@ -1026,9 +1030,7 @@ fi # first install
%endif
%posttrans
if [ -x /usr/bin/systemctl ] && /usr/bin/systemctl is-active rsyslog.service; then
/usr/bin/systemctl --marked reload-or-restart
fi
/usr/bin/systemctl --marked reload-or-restart ||:
%preun
#