#
# $Id$
-#
%define url $URL$
%define name myplc
Distribution: PlanetLab %{plrelease}
URL: %(echo %{url} | cut -d ' ' -f 2)
-
+%define nodefamily %{pldistro}-%{distroname}-%{_arch}
####################### myplc
Summary: PlanetLab Central (PLC) Portable Installation
%endif
# planetlab stuff
Requires: bootmanager
-Requires: bootcd-%{pldistro}-%{_arch}
+# 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: PLCAPI
-Requires: bootstrapfs-%{pldistro}-%{_arch}
+# make sure to remove 2-fold nodefamily stuff
+Conflicts: bootstrapfs-%{pldistro}-%{_arch}
+Requires: bootstrapfs-%{nodefamily}
Requires: myplc-docs
Requires: myplc-release
Requires: myplc-config
# 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