From: Ben Pfaff <blp@nicira.com>
Date: Tue, 8 Sep 2009 20:20:35 +0000 (-0700)
Subject: xenserver: Don't install at same time as XS 5.5.900 "openvswitch" package.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cbe3ea5a7e0c5347a65c30e59ea4041c34f8056;p=openvswitch

xenserver: Don't install at same time as XS 5.5.900 "openvswitch" package.

XenServer 5.5.900 installs an "openvswitch" package that this package
conflicts with, so add a "Conflicts: openvswitch" to the RPM packaging.
---

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index d4d157a5..8c234d3f 100644
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -28,6 +28,13 @@ Release: 1
 Source: openvswitch-%{vswitch_version}.tar.gz
 Buildroot: /tmp/vswitch-xen-rpm
 Requires: kernel-xen = %(echo '%{xen_version}' | sed 's/xen$//')
+# The following Conflicts prevents the "vswitch" package generated by
+# this spec file from installing at the same time as the "openvswitch"
+# package shipped with XenServer 5.5.900.  In fact, the packages
+# contain some files with identical names anyhow, so they will not
+# coexist, but adding an explicit Conflicts makes this conflict more
+# obvious.
+Conflicts: openvswitch
 
 %description
 The vswitch provides standard network bridging functions augmented with