From 57fe198854cdc4d7b99cdb6ac05fea3af42a9f35c4317f81ee2d75c1a88bb313 Mon Sep 17 00:00:00 2001 From: Lars Marowsky-Bree Date: Fri, 12 Dec 2014 15:29:12 +0000 Subject: [PATCH] Accepting request 264605 from home:wanglh:branches:network:ha-clustering:Factory fix conflict with other versions OBS-URL: https://build.opensuse.org/request/show/264605 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=4 --- drbd-utils.changes | 6 ++++++ drbd-utils.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drbd-utils.changes b/drbd-utils.changes index 13cc826..19fbf18 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 21 07:11:22 UTC 2014 - lwang@suse.com + +- add to drbd-utils.spec + Obsoletes: drbd < 8.4.5 + ------------------------------------------------------------------- Fri Nov 7 13:33:42 UTC 2014 - lwang@suse.com diff --git a/drbd-utils.spec b/drbd-utils.spec index 42bc313..461fb2b 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -30,11 +30,14 @@ Patch1: init-script-fixes.diff Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} Provides: drbd-udev = %{version} -Provides: drbd-utils = %{version} Obsoletes: drbd-bash-completion < %{version} Obsoletes: drbd-pacemaker < %{version} Obsoletes: drbd-udev < %{version} -Obsoletes: drbd-utils < %{version} +# drbd-utils first splict from drbd-8.4.5(only driver) +# and suse let drbd driver goes in-kernel +Provides: drbd = 8.4.5 +Obsoletes: drbd < 8.4.5 + %ifarch %ix86 x86_64 Provides: drbd-xen = %{version} Obsoletes: drbd-xen < %{version}