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

Accepting request 851245 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/851245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=154
This commit is contained in:
Dominique Leuenberger 2020-12-03 17:37:37 +00:00 committed by Git OBS Bridge
commit 7138c5fdad
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rsyslog.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 26 10:57:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Mon Nov 9 17:08:33 UTC 2020 - Thomas Blume <thomas.blume@suse.com>

6
rsyslog.spec
View File

@ -754,10 +754,10 @@ if test "%{rsyslog_module_dir_nodeps}" != "%{rsyslog_module_dir_withdeps}" ; the
%{buildroot}%{rsyslog_module_dir_withdeps}
done
fi
if test "%{_sbindir}" != "/sbin" ; then
%if !0%{?usrmerged}
install -d -m0755 %{buildroot}/sbin
ln -sf %{_sbindir}/rsyslogd $RPM_BUILD_ROOT/sbin/rsyslogd
fi
%endif
# it is simply broken (bnc#890228)
rm -f $RPM_BUILD_ROOT%{_sbindir}/zpipe
#
@ -916,7 +916,7 @@ fi # first install
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/*.frule
%{_sbindir}/rsyslogd
%if "%{_sbindir}" != "/sbin"
%if !0%{?usrmerged}
/sbin/rsyslogd
%endif
%dir %{rsyslog_module_dir_nodeps}