From 7c2a5dca572f9514083dcab014705cfea1469a2f515f443f4355639e19dd77be Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 24 Sep 2012 18:12:53 +0000 Subject: [PATCH] Accepting request 135714 from home:AndreasStieger:rsyslog:v6-stable - prevent installation with other providers of syslog (bnc#780608) OBS-URL: https://build.opensuse.org/request/show/135714 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=99 --- rsyslog.changes | 5 +++++ rsyslog.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/rsyslog.changes b/rsyslog.changes index b2f4f01..892cec4 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 24 17:58:16 UTC 2012 - andreas.stieger@gmx.de + +- prevent installation with other providers of syslog (bnc#780608) + ------------------------------------------------------------------- Fri Sep 21 08:09:46 UTC 2012 - mt@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 9a98572..0d5b294 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -63,6 +63,7 @@ Release: 0 %define rsyslog_module_dir_withdeps %{_prefix}/%{_lib}/rsyslog/ Url: http://www.rsyslog.com/ Provides: syslog +Conflicts: otherproviders(syslog) %if %{with syslogservice} Requires(pre): %insserv_prereq %fillup_prereq syslog-service /sbin/checkproc BuildRequires: syslog-service