From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 25 Jan 2010 20:06:06 +0000 (+0000)
Subject: use major numbers in conflicts
X-Git-Tag: BootManager-5.0-1^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b614f01bf625812ea0ff0f468e2111b761ef1538;p=bootmanager.git

use major numbers in conflicts
---

diff --git a/bootmanager.spec b/bootmanager.spec
index 5e9d053..f6d55f4 100644
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -31,9 +31,9 @@ Requires: pypcilib pyplnet monitor-runlevelagent
 
 ### avoid having yum complain about updates, as stuff is moving around
 # plc.d/bootmanager
-Conflicts: myplc <= 5.0
+Conflicts: myplc <= 4.3
 # nodeconfig/boot/*
-Conflicts: nodeconfig <= 5.0
+Conflicts: nodeconfig <= 4.3
 
 AutoReqProv: no
 %define debug_package %{nil}