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
This commit is contained in:
Lars Marowsky-Bree 2014-12-12 15:29:12 +00:00 committed by Git OBS Bridge
parent 7ea2275bfc
commit 57fe198854
2 changed files with 11 additions and 2 deletions

View File

@ -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 Fri Nov 7 13:33:42 UTC 2014 - lwang@suse.com

View File

@ -30,11 +30,14 @@ Patch1: init-script-fixes.diff
Provides: drbd-bash-completion = %{version} Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version} Provides: drbd-pacemaker = %{version}
Provides: drbd-udev = %{version} Provides: drbd-udev = %{version}
Provides: drbd-utils = %{version}
Obsoletes: drbd-bash-completion < %{version} Obsoletes: drbd-bash-completion < %{version}
Obsoletes: drbd-pacemaker < %{version} Obsoletes: drbd-pacemaker < %{version}
Obsoletes: drbd-udev < %{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 %ifarch %ix86 x86_64
Provides: drbd-xen = %{version} Provides: drbd-xen = %{version}
Obsoletes: drbd-xen < %{version} Obsoletes: drbd-xen < %{version}