From ea7279ef7f2f38d815af6e3ca63fc95b2becab2b20f015b218a3dfabbc0fc006 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 20 Nov 2012 12:23:33 +0000 Subject: [PATCH] Accepting request 142066 from home:mtomaschewski:syslog - Require syslog-service >= 2.0 on 12.3, otherwise < 2.0, which contain the /etc/init.d/syslog init script. OBS-URL: https://build.opensuse.org/request/show/142066 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=114 --- rsyslog.changes | 6 ++++++ rsyslog.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rsyslog.changes b/rsyslog.changes index a3275f6..fa54b9d 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 20 11:44:16 UTC 2012 - mt@suse.com + +- Require syslog-service >= 2.0 on 12.3, otherwise < 2.0, which + contain the /etc/init.d/syslog init script. + ------------------------------------------------------------------- Tue Nov 13 10:31:24 UTC 2012 - mt@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index ac487db..d2da09a 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -55,10 +55,13 @@ Url: http://www.rsyslog.com/ Provides: syslog Provides: sysvinit(syslog) Conflicts: otherproviders(syslog) -Requires(pre): syslog-service Requires(pre): %fillup_prereq %if %{with systemv} Requires(pre): %insserv_prereq +Requires(pre): syslog-service < 2.0 +Requires(pre): /etc/init.d/syslog +%else +Requires(pre): syslog-service >= 2.0 %endif %{?systemd_requires} BuildRequires: pkgconfig(systemd)