X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fvswitch-xen.spec;h=a23b3ec158e96916f4b7a91b48c286c14d293695;hb=b2cdfeae16fc4c7c7aedcc2b5e033abcaf52dc95;hp=d4d157a505ff6f016863bb099800630b198b537c;hpb=a320b3413d239aaf8cad506ffc6d72c93b6591b2;p=openvswitch

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index d4d157a5..a23b3ec1 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
@@ -301,10 +308,9 @@ if [ "$1" = "0" ]; then     # $1 = 1 for upgrade
     find  %{_prefix} -type d -depth -exec rmdir \{\} \; \
         || printf "Could not remove vSwitch install directory.\n"
 
-    # Remove all configuration and log files
+    # Remove all configuration files
     rm -f /etc/ovs-vswitchd.conf
     rm -f /etc/sysconfig/vswitch
-    rm -f /var/log/vswitch*
     rm -f /etc/ovs-vswitchd.cacert
 
     printf "\nYou MUST reboot the server now to complete the change to\n"