Accepting request 848798 from Base:System

OBS-URL: https://build.opensuse.org/request/show/848798
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger 2020-11-23 14:32:27 +00:00 committed by Git OBS Bridge
commit 868c27366f
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 9 17:08:33 UTC 2020 - Thomas Blume <thomas.blume@suse.com>
- fix location and naming of journald dropin (bsc#1178288)
-------------------------------------------------------------------
Wed Oct 28 07:10:22 UTC 2020 - Thomas Blume <thomas.blume@suse.com>

View File

@ -805,8 +805,8 @@ install -m644 plugins/ompgsql/createDB.sql \
%endif
install -d -m0755 %{buildroot}%{_unitdir}
install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/
install -d -m0755 %{buildroot}%{_sysconfdir}/systemd/journald.conf.d
install -m644 %{SOURCE16} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf
install -d -m0755 %{buildroot}%{_prefix}/lib/systemd/journald.conf.d
install -m644 %{SOURCE16} %{buildroot}%{_prefix}/lib/systemd/journald.conf.d/30-rsyslog.conf
# create ghosts
install -d -m0755 %{buildroot}%{rsyslog_rundir}
touch %{buildroot}%{rsyslog_sockets_cfg}
@ -969,8 +969,8 @@ fi # first install
%if %{with journal}
%{rsyslog_module_dir_nodeps}/imjournal.so
%{rsyslog_module_dir_nodeps}/omjournal.so
%dir %{_sysconfdir}/systemd/journald.conf.d/
%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf
%dir %{_prefix}/lib/systemd/journald.conf.d/
%{_prefix}/lib/systemd/journald.conf.d/30-rsyslog.conf
%endif
%dir %{rsyslog_module_dir_withdeps}
%{_mandir}/man5/rsyslog.conf.5*