X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=f7bdfb7e5c554e3e84354c2fbc3b3ba7ef0c3296;hb=f9c00973b54d0982fcbf83aa2c3bb22fce3e9c41;hp=455249cf28ce97389372685c3db556b87df6ebf3;hpb=56ad918e5dcc25c1ab6b50aaf8a50eb70004fede;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index 455249c..f7bdfb7 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -61,16 +61,13 @@ Requires: vixie-cron
 %endif
 # planetlab stuff
 Requires: bootmanager
-# make sure to remove 2-fold nodefamily stuff
-Conflicts: bootcd-%{pldistro}-%{_arch}
 Requires: bootcd-%{nodefamily}
 Requires: bootcd-initscripts
 Requires: PLCWWW
 Requires: www-register-wizard
 Requires: nodeconfig
+Requires: nodeyum
 Requires: PLCAPI
-# make sure to remove 2-fold nodefamily stuff
-Conflicts: bootstrapfs-%{pldistro}-%{_arch}
 Requires: bootstrapfs-%{nodefamily}
 Requires: myplc-docs
 Requires: myplc-release