Support old BootCDs which do not have pypcilib.

[bootmanager.git] / bootmanager.spec

diff --git a/bootmanager.spec b/bootmanager.spec
index 8794128..9098895 100644 (file)
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -1,14 +1,19 @@
+#
+# $Id: bootmanager.spec 856 2007-09-21 13:54:58Z thierry $
+#
 %define name bootmanager
-%define version 3.1.15
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 3.2
+%define subversion 1
+
+%define release %{subversion}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
+Distribution: PlanetLab 4.2
 URL: http://cvs.planet-lab.org/cvs/bootmanager
 
 Summary: The PlanetLab Boot Manager
-Name: bootmanager
+Name: %{name}
 Version: %{version}
 Release: %{release}
 License: BSD
@@ -16,7 +21,7 @@ Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires: tar, gnupg, sharutils, bzip2
+Requires: tar, gnupg, sharutils, bzip2, pypcilib
 
 AutoReqProv: no
 %define debug_package %{nil}
@@ -29,27 +34,22 @@ nodes.
 %setup -q
 
 %build
-pushd bootmanager
-
+pushd BootManager
 ./build.sh
-make -C support-files
-
 popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd bootmanager
+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
-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
+
+# This is only required for 2.x bootcds.
+install -D -m 644 support-files/uudecode.gz $RPM_BUILD_ROOT/var/www/html/boot/uudecode.gz
 
 popd
 
@@ -59,12 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 # If run under sudo
 if [ -n "$SUDO_USER" ] ; then
     # Allow user to delete the build directory
-    chown -R $SUDO_USER .
+    chown -h -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}
+    chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
 fi
 
 %post
@@ -81,4 +81,3 @@ EOF
 %changelog
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> - 
 - Initial build.
-