From 416e74c18e77243ab3b948eb9db7ac1a8735cc8c6d6032db064e729312d30568 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 18 Feb 2011 09:34:28 +0000 Subject: [PATCH] - revert back to conflicts: sysvinit OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=116 --- systemd.changes | 5 +++++ systemd.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index 23156b5a..a71d3d18 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 18 09:33:55 UTC 2011 - coolo@novell.com + +- revert back to conflicts: sysvinit + ------------------------------------------------------------------- Thu Feb 17 15:04:44 CET 2011 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 02214633..cf0c8a07 100644 --- a/systemd.spec +++ b/systemd.spec @@ -70,7 +70,7 @@ Group: System/Base Summary: System V init tools Requires: %{name} = %{version}-%{release} Provides: sbin_init -Obsoletes: sysvinit +Conflicts: sysvinit Conflicts: upstart %description sysvinit