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

Accepting request 1058141 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1058141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=172
This commit is contained in:
Dominique Leuenberger 2023-01-15 16:57:45 +00:00 committed by Git OBS Bridge
commit 1b3326a8d1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rsyslog.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:18:37 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 6 21:03:48 UTC 2022 - Michael Ströder <michael@stroeder.com> Tue Dec 6 21:03:48 UTC 2022 - Michael Ströder <michael@stroeder.com>

4
rsyslog.spec
View File

@ -758,7 +758,7 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the
%{buildroot}%{rsyslog_module_dir_withdeps} %{buildroot}%{rsyslog_module_dir_withdeps}
done done
fi fi
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
install -d -m0755 %{buildroot}/sbin install -d -m0755 %{buildroot}/sbin
ln -sf %{_sbindir}/rsyslogd $RPM_BUILD_ROOT/sbin/rsyslogd ln -sf %{_sbindir}/rsyslogd $RPM_BUILD_ROOT/sbin/rsyslogd
%endif %endif
@ -920,7 +920,7 @@ fi # first install
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/*.frule %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/*.frule
%{_sbindir}/rsyslogd %{_sbindir}/rsyslogd
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/rsyslogd /sbin/rsyslogd
%endif %endif
%dir %{rsyslog_module_dir_nodeps} %dir %{rsyslog_module_dir_nodeps}