plc.d/packages part of nodeyum

[myplc.git] / myplc.spec

diff --git a/myplc.spec b/myplc.spec
index 854357b..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
@@ -146,7 +143,7 @@ chmod 444 ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts/*
 # Install configuration file
 echo "* myplc: Installing configuration file"
 install -D -m 444 plc_config.dtd ${RPM_BUILD_ROOT}/etc/planetlab/plc_config.dtd
-sed -e "s,@PLDISTRO@,%{pldistro},g" -e "s,@FCDISTRO@,%{fcdistro},g" -e "s,@ARCH@,%{_arch},g" \
+sed -e "s,@PLDISTRO@,%{pldistro},g" -e "s,@FCDISTRO@,%{distroname},g" -e "s,@ARCH@,%{_arch},g" \
     default_config.xml > ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml
 chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/default_config.xml