* ./goodies:

- New: In buildCoriolis.py, support for the distribution patch.
        The distribution patch do some customizations needed for the distribution.
    - Change: In coriolis2.spec.in, support for patch, include starter
        documentation. Do not prepend %{buildroot} to CORIOLIS_TOP environment
        variables.

bootstrap/buildCoriolis.py

@@ -117,6 +117,7 @@ class ProjectBuilder:
         self._specFile     = os.path.join ( self._sourceDir, "goodies", "coriolis2.spec" )
         self._sourceTarBz2 = "coriolis2-1.0.%s.tar.bz2"                  % self._svnTag
         self._binaryTarBz2 = "coriolis2-binary-1.0.%s-1.el5_soc.tar.bz2" % self._svnTag
+        self._distribPatch = os.path.join ( self._sourceDir, "goodies", "coriolis2-for-distribution.patch" )
         return
 
 
@@ -464,15 +465,18 @@ class ProjectBuilder:
 
         rpmSpecFile   = os.path.join ( self._rpmTopDir, "SPECS/coriolis2.spec" )
         rpmSourceFile = os.path.join ( self._rpmTopDir, "SOURCES", self._sourceTarBz2 )
+        rpmPatchFile  = os.path.join ( self._rpmTopDir, "SOURCES", "coriolis2-for-distribution.patch" )
 
         sourceFile = os.path.join ( self._tarballDir, self._sourceTarBz2 )
 
         if os.path.isfile ( rpmSpecFile ):
             os.unlink ( rpmSpecFile )
-
         os.symlink ( self._specFile  , rpmSpecFile   )
+
         if not os.path.islink ( rpmSourceFile ):
             os.symlink ( sourceFile, rpmSourceFile )
+        if not os.path.islink ( rpmPatchFile ):
+            os.symlink ( self._distribPatch, rpmPatchFile )
 
         os.chdir ( os.path.join ( os.environ["HOME"], "rpm" ) )
         command = [ "/usr/bin/rpmbuild", "-ba", "--with", "binarytar", rpmSpecFile ]

bootstrap/coriolis2.spec.in

@@ -54,8 +54,8 @@ Development files for the Coriolis 2 package.
 %build
  if [ -d %{buildroot} ]; then rm -r %{buildroot}; fi
 
- VLSISAPD_TOP=%{buildroot}%{coriolisTop}; export VLSISAPD_TOP
- CORIOLIS_TOP=%{buildroot}%{coriolisTop}; export CORIOLIS_TOP
+ VLSISAPD_TOP=%{coriolisTop}; export VLSISAPD_TOP
+ CORIOLIS_TOP=%{coriolisTop}; export CORIOLIS_TOP
 
 # Do build & install in one step.
  tools="vlsisapd hurricane crlcore knik katabatic kite equinox solstice unicorn"
@@ -110,6 +110,7 @@ Development files for the Coriolis 2 package.
 %files
 %defattr(-,root,root,-)
 %docdir %{_docdir}/coriolis2/
+%doc README.*
 %dir %{_sysconfdir}/coriolis2
 %dir %{coriolisTop}/share/coriolis2/flute-2.4
 %dir %{coriolisTop}/bin