Accepting request 291263 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/291263
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslogd?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger 2015-03-19 20:00:56 +00:00 committed by Git OBS Bridge
commit 439e5c8c04
2 changed files with 18 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 11 09:08:48 UTC 2015 - werner@suse.de
- Be aware that klog.service should be handled by the
systemd rpm macros
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 9 13:01:26 UTC 2014 - werner@suse.de Thu Oct 9 13:01:26 UTC 2014 - werner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package syslogd # spec file for package syslogd
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -264,12 +264,23 @@ chown news:news var/log/news/news.notice
%postun %postun
%service_del_postun syslogd.service %service_del_postun syslogd.service
%preun -n syslog-service
%service_del_preun klog.service
%post -n syslog-service %post -n syslog-service
%{remove_and_set -n syslog SYSLOG_DAEMON} %{remove_and_set -n syslog SYSLOG_DAEMON}
%{remove_and_set -n syslog SYSLOG_REQUIRES_NETWORK} %{remove_and_set -n syslog SYSLOG_REQUIRES_NETWORK}
# when exists, remove the broken link pointing to the # when exists, remove the broken link pointing to the
# common syslog.service file, we've provided before... # common syslog.service file, we've provided before...
rm -f /etc/systemd/system/multi-user.target.wants/syslog.service rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
%service_add_post klog.service
/usr/bin/systemctl -f enable klog.service >/dev/null 2>&1 || :
%pre -n syslog-service
%service_add_pre klog.service
%postun -n syslog-service
%service_del_postun klog.service
%pre -n klogd %pre -n klogd
%service_add_pre klogd.service %service_add_pre klogd.service