Accepting request 319181 from home:wanghaisu:branches:network:ha-clustering:Factory

BSC#939778. Add obsoletes and a description for kmp package.

OBS-URL: https://build.opensuse.org/request/show/319181
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=15

drbd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 29 01:03:11 UTC 2015 - nwang@suse.com
+
+- BSC#939778. Add obsolete of old packages and a description for
+  KMP package.
+- Require kernel-source-rt for RT. 
+
 -------------------------------------------------------------------
 Mon Jul 20 07:52:36 UTC 2015 - nwang@suse.com
 

drbd.spec

@@ -25,7 +25,7 @@ Name:           drbd
 Version:        8.4.6
 Release:        0
 #Name:           drbd-kernel
-Summary:        Kernel driver for DRBD
+Summary:        Distributed Replicated Block Device
 License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
 Url:            http://www.drbd.org/
@@ -52,16 +52,32 @@ BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
 %if 0%{?buildrt} == 1
+BuildRequires:  kernel-source-rt
 BuildRequires:  kernel-syms-rt
 %endif
+
 Requires:       drbd-utils >= 8.9.0
 Supplements:    drbd-utils >= 8.9.0
+Obsoletes:      drbd-bash-completion < %{version}
+Obsoletes:      drbd-kmp < %{version}
+Obsoletes:      drbd-pacemaker < %{version}
+Obsoletes:      drbd-udev < %{version}
+Obsoletes:      drbd-utils < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    i586 s390
 
 %kernel_module_package -n drbd -p %_sourcedir/preamble
 
 %description
+Drbd is a distributed replicated block device. It mirrors a block
+device over the network to another machine. Think of it as networked
+raid 1. It is a building block for setting up clusters.
+
+%package KMP
+Summary:        Kernel driver for DRBD
+Group:          Productivity/Clustering/HA
+
+%description KMP
 This module is the kernel-dependent driver for DRBD.  This is split out so
 that multiple kernel driver versions can be installed, one for each
 installed kernel.

preamble

@@ -1 +1,3 @@
 Requires: kernel-%1
+Recommends: drbd
+Recommends: drbd-utils