X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootmanager.spec;h=87941284f0204cfa28ea84227a649be30c5d4226;hb=48bd014c62be29904375de5144350bc935a4c029;hp=248b3f05c03849a5db54fb2be225cf1d984b499e;hpb=3560fab176ecae9f58e78b409de85bc0c6e6a11b;p=bootmanager.git

diff --git a/bootmanager.spec b/bootmanager.spec
index 248b3f0..8794128 100644
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -1,6 +1,6 @@
 %define name bootmanager
-%define version 3.1
-%define release 1.planetlab.planetlab%{?date:.%{date}}
+%define version 3.1.15
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -16,6 +16,11 @@ Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+Requires: tar, gnupg, sharutils, bzip2
+
+AutoReqProv: no
+%define debug_package %{nil}
+
 %description
 The PlanetLab Boot Manager securely authenticates and boots PlanetLab
 nodes.
@@ -24,25 +29,42 @@ nodes.
 %setup -q
 
 %build
+pushd bootmanager
+
 ./build.sh
-make -C support-files PlanetLab-Bootstrap.tar.bz2
+make -C support-files
+
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+pushd bootmanager
+
+# Install source so that it can be rebuilt
+find build.sh source | cpio -p -d -u $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+
 install -D -m 755 bootmanager.sh $RPM_BUILD_ROOT/var/www/html/boot/bootmanager.sh
-install -D -m 644 support-files/PlanetLab-Bootstrap.tar.bz2 $RPM_BUILD_ROOT/var/www/html/boot/PlanetLab-Bootstrap.tar.bz2
+for file in \
+    uudecode.gz \
+    PlanetLab-Bootstrap.tar.bz2 ; do
+  install -D -m 644 support-files/$file $RPM_BUILD_ROOT/var/www/html/boot/$file
+done
 
-# If run under sudo, allow user to delete the build directory
-if [ -n "$SUDO_USER" ] ; then
-    chown -R $SUDO_USER .
-fi
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# If run under sudo, allow user to delete the built RPM
+# If run under sudo
 if [ -n "$SUDO_USER" ] ; then
-    chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm
+    # Allow user to delete the build directory
+    chown -R $SUDO_USER .
+    # Some temporary cdroot files like /var/empty/sshd and
+    # /usr/bin/sudo get created with non-readable permissions.
+    find . -not -perm +0600 -exec chmod u+rw {} \;
+    # Allow user to delete the built RPM(s)
+    chown -R $SUDO_USER %{_rpmdir}/%{_arch}
 fi
 
 %post
@@ -53,8 +75,8 @@ EOF
 
 %files
 %defattr(-,root,root,-)
-/var/www/html/boot/bootmanager.sh
-/var/www/html/boot/PlanetLab-Bootstrap.tar.bz2
+%{_datadir}/%{name}
+/var/www/html/boot/*
 
 %changelog
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> -