X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=noderepo.spec;h=cfee2fb1d77ac832fa8912f7a804fd8d8d7d3212;hb=de762a94282456bd871b26de0b95edfc4227da21;hp=3fca34e77ce9f280ffbf4c3fee127d4979aa426c;hpb=8404a0f3da559c3f32b8078fbf5ea317d40785f8;p=bootstrapfs.git

diff --git a/noderepo.spec b/noderepo.spec
index 3fca34e..cfee2fb 100644
--- a/noderepo.spec
+++ b/noderepo.spec
@@ -8,9 +8,9 @@
 # %{distrorelease}  : e.g. 8
 # %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
 
-%define nodetype %{pldistro}-%{_arch}
+%define nodefamily %{pldistro}-%{_arch}
 
-%define name noderepo-%{nodetype}
+%define name noderepo-%{nodefamily}
 %define version 0.1
 %define taglevel 2
 
@@ -50,12 +50,12 @@ echo nothing to do at build time for noderepo
 %install
 rm -rf $RPM_BUILD_ROOT
 
-repo=%{nodetype}
+repo=%{nodefamily}
 install -d -m 755 $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
 rpms=$(echo %{node_rpms_plus} | sed -e 's,+++, ,g')
 for rpm in $rpms; do rsync %{_topdir}/$rpm $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/ ; done
 ### yumgroups
-install -D -m 644 %{_topdir}/RPMS/yumgroups.xml $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
+install -D -m 644 %{_topdir}/RPMS/yumgroups.xml $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/yumgroups.xml
 # do not do this yet, as plc.d/packages will do it anyway
 #createrepo -g yumgroups.xml $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
 
@@ -67,7 +67,7 @@ service plc start packages
 
 %files
 %defattr(-,root,root,-)
-/var/www/html/install-rpms/%{nodetype}
+/var/www/html/install-rpms/%{nodefamily}
 
 %changelog
 * Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -