X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=noderepo.spec;h=cfee2fb1d77ac832fa8912f7a804fd8d8d7d3212;hb=de762a94282456bd871b26de0b95edfc4227da21;hp=1b115824fbe7d23c0b19e7f6ca33578a0e80ec66;hpb=b8d46ac408168bb819f810652ed2de5043dfefc6;p=bootstrapfs.git

diff --git a/noderepo.spec b/noderepo.spec
index 1b11582..cfee2fb 100644
--- a/noderepo.spec
+++ b/noderepo.spec
@@ -8,9 +8,11 @@
 # %{distrorelease}  : e.g. 8
 # %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
 
-%define name noderepo-%{distroname}-%{_arch}
-%define version 4.2
-%define taglevel 1
+%define nodefamily %{pldistro}-%{_arch}
+
+%define name noderepo-%{nodefamily}
+%define version 0.1
+%define taglevel 2
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -27,8 +29,11 @@ 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}
 
@@ -45,23 +50,24 @@ echo nothing to do at build time for noderepo
 %install
 rm -rf $RPM_BUILD_ROOT
 
-repo=planetlab-%{distroname}-%{_arch}
+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
+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 $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
 
 %post
-
+service plc start packages
 
 %files
 %defattr(-,root,root,-)
-/var/www/html/install-rpms/planetlab-%{distroname}-%{_arch}
+/var/www/html/install-rpms/%{nodefamily}
 
 %changelog
 * Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -