X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=6da4ed39446f935f66ec44ed338f6a06aa81cb91;hb=74743d62939a97076cc7c0a5ff9b01da71db45bc;hp=b10441b02cc5869fbf68837d1be6b0ebe7766c31;hpb=156714c74c481b2802b0d63feea3191b4263f7e4;p=myplc.git

diff --git a/myplc.spec b/myplc.spec
index b10441b..6da4ed3 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -6,12 +6,17 @@ URL: http://cvs.planet-lab.org/cvs/myplc
 Summary: PlanetLab Central (PLC) Portable Installation
 Name: myplc
 Version: 0.5
-Release: 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+Release: 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 License: PlanetLab
 Group: Applications/Systems
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# for preventing myplc-devel from being built
+# *should* support invokation like rpmbuild --define "build_level 0" 
+# *but* this does not seem to work : so just set to 0 here
+%{!?build_level: %define build_devel 1}
+
 %define debug_package %{nil}
 
 %description
@@ -23,24 +28,33 @@ through a graphical interface. All PLC services are started up and
 shut down through a single System V init script installed in the host
 system.
 
+%if %{build_devel}
 %package devel
 Summary: PlanetLab Central (PLC) Development Environment
 Group: Development/Tools
 AutoReqProv: no
+%endif
 
+%if %{build_devel}
 %description devel
 This package install a complete PlanetLab development environment
 contained within a chroot jail. The default installation consists of a
 local CVS repository bootstrapped with a snapshot of all PlanetLab
 source code, and all the tools necessary to compile it.
+%endif
 
 %prep
 %setup -q
 
 %build
 pushd myplc
+%if %{build_devel}
+echo -n "XXXXXXXXXXXXXXX myplc::build_devel " ; date
 ./build_devel.sh %{?cvstag:-t %{cvstag}}
+%endif
+echo -n "XXXXXXXXXXXXXXX myplc::build " ; date
 ./build.sh %{?cvstag:-t %{cvstag}}
+echo -n "XXXXXXXXXXXXXXX myplc::endbuild " ; date
 popd
 
 %install
@@ -71,6 +85,8 @@ find data | cpio -p -d -u $RPM_BUILD_ROOT/plc/
 # myplc-devel
 #
 
+%if %{build_devel}
+
 # Install host startup script and configuration file
 install -D -m 755 host.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/plc-devel
 install -D -m 644 plc-devel.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/plc-devel
@@ -86,6 +102,8 @@ find devel/data | cpio -p -d -u $RPM_BUILD_ROOT/plc/
 # unique name. A hard-linked copy is made in %post.
 mv $RPM_BUILD_ROOT/plc/devel/data/{cvs,cvs-%{version}-%{release}}
 
+%endif
+
 popd
 
 %clean
@@ -94,12 +112,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
 
 %pre
@@ -129,6 +147,10 @@ if [ $1 -gt 0 ] ; then
 	    mkdir -p /plc/data/$dir.rpmsave
 	    tar -C /plc/data/$dir -cpf - . | \
 	       tar -C /plc/data/$dir.rpmsave -xpf -
+
+	    # Except for the default configuration file and DTD, which
+	    # really should be considered for upgrade.
+	    rm -f /plc/data/$dir.rpmsave/{default_config.xml,plc_config.dtd}
 	fi
     done
 fi
@@ -139,9 +161,6 @@ if [ -x /sbin/chkconfig ] ; then
     /sbin/chkconfig plc on
 fi
 
-# Force a regeneration to take into account new variables
-touch /plc/data/etc/planetlab/default_config.xml
-
 %triggerpostun -- %{name}
 # 0 = erase, 1 = upgrade
 if [ $1 -gt 0 ] ; then
@@ -166,11 +185,14 @@ if [ $1 -eq 0 ] ; then
     fi
 fi
 
+%if %{build_devel}
 %pre devel
 if [ -x %{_sysconfdir}/init.d/plc-devel ] ; then
     %{_sysconfdir}/init.d/plc-devel stop
 fi
+%endif
 
+%if %{build_devel}
 %post devel
 if [ -x /sbin/chkconfig ] ; then
     /sbin/chkconfig --add plc-devel
@@ -182,7 +204,9 @@ fi
 if [ ! -d /plc/devel/data/cvs ] ; then
     cp -rl /plc/devel/data/{cvs-%{version}-%{release},cvs}
 fi
+%endif
 
+%if %{build_devel}
 %preun devel
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
@@ -192,6 +216,7 @@ if [ $1 -eq 0 ] ; then
 	/sbin/chkconfig --del plc-devel
     fi
 fi
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -210,6 +235,7 @@ fi
 %dir /plc/data
 %config(noreplace) /plc/data/*
 
+%if %{build_devel}
 %files devel
 %defattr(-,root,root,-)
 # Host startup script and configuration file
@@ -223,8 +249,23 @@ fi
 # Data directory
 %dir /plc/devel/data
 %config(noreplace) /plc/devel/data/*
+%endif
 
 %changelog
+* Tue Aug 22 2006 Mark Huang <mlhuang@CS.Princeton.EDU> - 0.4-3, 0.5-3
+- MyPLC 0.4 RC3.
+- Fix upgrade path from RC1.
+- Always regenerate plc_config.xml at first startup
+- Upgrade kernel, iptables, vnet to 2.6.17-1.2142_FC4-3.planetlab
+- Minor PlanetFlow fixes
+- pl_mom/swapmon: Minor fixes
+- bootcd: Added Supermicro IPMI support
+- bootmanager: Cleanup, fixed check for new disks
+
+* Wed Aug 09 2006 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+- introduces variable %{build_devel} to allow custom sites to skip building
+  the myplc-devel package.
+
 * Thu Jul 13 2006 Mark Huang <mlhuang@CS.Princeton.EDU> - 0.4-2, 0.5-2
 - MyPLC 0.4 RC2.
 - Fix many spec files (License replaces Copyright).