X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=noderepo.spec;h=cfee2fb1d77ac832fa8912f7a804fd8d8d7d3212;hb=7b74056e4ef7410dcfe2a4d6ebf210a0a3a3a927;hp=926889442e79adbeacaadfa0a82801e1cca0280d;hpb=a3d8212875d89619125cd2bc98972a572863a218;p=nodeimage.git

diff --git a/noderepo.spec b/noderepo.spec
index 9268894..cfee2fb 100644
--- a/noderepo.spec
+++ b/noderepo.spec
@@ -8,11 +8,11 @@
 # %{distrorelease}  : e.g. 8
 # %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
 
-%define nodetype %{pldistro}%{distroname}%{_arch}
+%define nodefamily %{pldistro}-%{_arch}
 
-%define name noderepo-%{nodetype}
-%define version 4.2
-%define taglevel 1
+%define name noderepo-%{nodefamily}
+%define version 0.1
+%define taglevel 2
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -29,8 +29,10 @@ License: BSD
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# other archs must be able to install this
+BuildArch: noarch
 
-BuildRequires: rsync createrepo
+BuildRequires: rsync 
 Requires: myplc
 
 %define debug_package %{nil}
@@ -48,13 +50,14 @@ 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 $RPM_BUILD_ROOT/$rpm $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/ ; done
+for rpm in $rpms; do rsync %{_topdir}/$rpm $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/ ; done
 ### yumgroups
-install -D -m 644 $RPM_BUILD_ROOT/RPMS/yumgroups.xml $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
-createrepo -g 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,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> -