X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.spec;h=8c83f72fcf5e8f8b203a9cb66ad0c5feaf46fcdc;hb=cb17dac44d863b338cc180f87a663e8eb22d9d60;hp=019b98ceeeb56ae5bfd748401c4c728a11a00e1b;hpb=a33782f03d28d91f49e3451846e76526c33f9088;p=nodeconfig.git

diff --git a/nodeconfig.spec b/nodeconfig.spec
index 019b98c..8c83f72 100644
--- a/nodeconfig.spec
+++ b/nodeconfig.spec
@@ -4,7 +4,7 @@
 %define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $
 
 %define name nodeconfig
-%define version 5.0
+%define version 4.3
 %define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -26,7 +26,9 @@ URL: %(echo %{url} | cut -d ' ' -f 2)
 
 # We use set everywhere
 Requires: php >= 5.0
-Requires: PLCAPI >= 5.0
+Requires: PLCAPI >= 4.3
+# need the apache user at install-time
+Requires: httpd 
 
 %description
 
@@ -40,14 +42,14 @@ reasons these scripts get installed in /var/www/html/PlanetLabConf.
 %setup -q
 
 %build
-pushd yum
+pushd nodeconfig/yum
 
-EXCLUDE="exclude=kernel* util-vserver* iptables iproute"
+KEXCLUDE="exclude=$(../../build/getkexcludes.sh)"
 
-# expand list of excludes
+# expand list of kexcludes
 for filein in $(find . -name '*.in') ; do
     file=$(echo $filein | sed -e "s,\.in$,,")
-    sed -e "s,@EXCLUDE@,$EXCLUDE,g" $filein > $file
+    sed -e "s,@KEXCLUDE@,$KEXCLUDE,g" $filein > $file
 done
 
 # scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant
@@ -55,7 +57,7 @@ done
 for fcdistro in $(ls); do
     [ -d $fcdistro ] || continue
     pushd $fcdistro/yum.myplc.d
-    rm f stock.repo
+    rm -f stock.repo
     cat *.repo > stock.repo
     popd
 done
@@ -65,6 +67,8 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd nodeconfig
+
 echo "* nodeconfig: Installing PlanetLabConf pages"
 
 for dir in boot PlanetLabConf PLCAPI ; do
@@ -73,16 +77,24 @@ for dir in boot PlanetLabConf PLCAPI ; do
 done
 
 # the yum area -- se db-config
-# expose (fixed) myplc.repo.php as				           https://<plc>/yum/myplc.repo.php
-install -D -m 644 ./yum/myplc.repo.php			    $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php
-# expose the fcdistro-dependant yum.conf as				   https://<plc>/yum/yum.conf
-install -D -m 644 ./yum/%{fcdistro}/yum.conf		    $RPM_BUILD_ROOT/var/www/html/yum/yum.conf
-# expose the (fcdistro-dependant) stock.repo as				   https://<plc>/yum/stock.repo
-install -D -m 644 ./yum/%{fcdistro}/yum.myplc.d/stock.repo  $RPM_BUILD_ROOT/var/www/html/yum/stock.repo
+# expose (fixed) myplc.repo.php as				            https://<plc>/yum/myplc.repo.php
+install -D -m 644 ./yum/myplc.repo.php			     $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php
+# expose the fcdistro-dependant yum.conf as				    https://<plc>/yum/yum.conf
+install -D -m 644 ./yum/%{distroname}/yum.conf		     $RPM_BUILD_ROOT/var/www/html/yum/yum.conf
+# expose the (fcdistro-dependant) stock.repo as				    https://<plc>/yum/stock.repo
+install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo
+
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+# the boot manager upload area
+mkdir -p /var/log/bm
+chown apache:apache /var/log/bm
+chmod 700 /var/log/bm
+
 %files
 %defattr(-,root,root,-)
 /var/www/html/boot
@@ -91,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/yum
 
 %changelog
-* Wed Sep 10 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-1
+* Wed Sep 10 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-4.3-1
 - reflects new names from the data model
 
 * Tue Apr 22 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-4.2-4