fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec...

[myplc.git] / myplc.spec

diff --git a/myplc.spec b/myplc.spec
index 455249c..f7bdfb7 100644 (file)
--- 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