From: Martin Xu <martinxu9....@gmail.com>

This patch removes the "Conflicts" tag and adds "Obsoletes" tag.

With the conflicts tag, when a user attempts to install or upgrade with
the same version as already installed, the conflict kicks in. Otherwise,
such is allowed with --replacepkgs.

Obsoletes is needed for the upgrade path from kmod-openvswitch to
openvswitch-kmod.

Fixes: 22c33c3039 (rhel: support kmod build against mulitple kernel
versions, fedora)

VMware-BZ: #2249788

Signed-off-by: Martin Xu <martinxu9....@gmail.com>
Signed-off-by: Greg Rose <gvrose8...@gmail.com>
CC: Flavio Leitner <f...@sysclose.org>
CC: Yi-Hung Wei <yihung....@gmail.com>
CC: Yifeng Sun <pkusunyif...@gmail.com>
CC: Zak Whittington <zwhitt.vmw...@gmail.com>
CC: Ben Pfaff <b...@ovn.org>
---
v1->v2: adds "Obsoletes" tag needed for upgrade after renaming
        adds more reviewers
v2-v3: Incorporate Flavio's recommendation to check version and
       release values.
---
 rhel/openvswitch-kmod-fedora.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rhel/openvswitch-kmod-fedora.spec.in 
b/rhel/openvswitch-kmod-fedora.spec.in
index 8d54fd7..9a4c489 100644
--- a/rhel/openvswitch-kmod-fedora.spec.in
+++ b/rhel/openvswitch-kmod-fedora.spec.in
@@ -33,7 +33,7 @@ Source: openvswitch-%{version}.tar.gz
 #Source1: openvswitch-init
 Buildroot: /tmp/openvswitch-xen-rpm
 Provides: kmod-openvswitch
-Conflicts: kmod-openvswitch
+Obsoletes: kmod-openvswitch < %{version}-%{release}
 
 %description
 Open vSwitch provides standard network bridging functions augmented with
-- 
1.8.3.1

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to