Tue Apr 5 12:57:22 UTC 2011 Don Hudson <hudsond@ociweb.com>

        * docs/html/MakeProjectCreator.html:

          Added bracketed (multiline) assigments to documentation,
          i.e., assignment of form:

          keyword <operator> [optional flags] {
                    This is
                    a multiline assignment.
          }

          Optional flags are \s to retain leading white space and
          \n to retain new lines.  These flags are be combined.

        * docs/templates/rpmspec.txt:

          Added rpm_pre_cmd keyword for %pre section of the RPM spec file
          and rpm_url for the URL tag in the RPM spec file.

        * modules/AutomakeWorkspaceCreator.pm:

          Changed to default to cacheok of false as some intermediate project
          files are deleted must be regenerated if a project is regenerated.
          This was causing an error, but the error was only being logged.

          Changed to return an error code and message when workspace generation
          fails in some cases where an error message was only logged.

        * modules/Creator.pm:

          Added parse_assignment() that pre-parses bracketed assigments
          (see comment on docs/html/MakeProjectCreator.html) before
          calling SUPER::parse_assignment(). This method takes an optional
          file handle that must be used for bracketed assignment support.

        * modules/DirectoryManager.pm:

          Corrected typo in comment.

        * modules/Parser.pm:

          Added strip_comments(), strip_lt_whitespace(), and is_blank_line().

        * modules/ProjectCreator.pm:

          Added file handle parse_assignment and related method calls for
          bracketed assignment support.  See comment on modules/Creator.pm.

          Added case sensitivity logic to already_added() similar to other places in code.

        * modules/RpmSpecWorkspaceCreator.pm:

          Changed write_and_compare_file() to return 1 instead of undef as method
          must now return status.

          Added %pre section and URL tag to RPM spec file generation.

        * modules/StringProcessor.pm:

          Changed parse_assignment() to not strip ending new line
          as later parsing may need it.

        * modules/WorkspaceCreator.pm:

          Added file handle parse_assignment and related method calls for
          bracketed assignment support.  See comment on modules/Creator.pm.

          Changed to return an error code and message when workspace generation
          fails in some cases where an error message was only logged.

          Added default_cacheok() which returns true and is used to set 'cacheok'
          so this method can be overridden when 'cacheok' needs to be false.

2 files changed, 21 insertions, 0 deletions

diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index fd586e56..3ea742c0 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -2202,6 +2202,25 @@
               <li class="BodyNoLead">Assignments can also use the <em class=
               "Code">+=</em> and <em class="Code">-=</em> operators to add
               and subtract values from keyword values.</li>
+             
+              <li class="Body">Assignments can be bracketed by curly braces 
+              so they can span multiple lines. The opening curly brace must 
+              be the last thing on the same line as the operator and the closing 
+              brace must be on its own line (but can have leading white space).  
+              Optionally, \n, \s, or \ns can be included after the operator.  These
+              indicate that new lines should be retained (\n) and leading white space
+              should be retained (\s).</li>
+
+              <li style="list-style: none">
+                <p class="Code">&nbsp;</p>
+                <p class="Code">specific(rpmspec) {</p>
+                <p class="Code">&nbsp;rpm_description = \ns {</p>
+                <p class="Code">This description</p>
+                <p class="Code">spans multiple lines.</p>
+                <p class="Code">&nbsp;}</p>
+                <p class="Code">}</p>
+                <p class="Code">&nbsp;</p>
+              </li>
 
               <li class="Body">If a <em class="Code">sharedname</em> is
               specified in the mpc file and <em class="Code">staticname</em>
diff --git a/docs/templates/rpmspec.txt b/docs/templates/rpmspec.txt
index 3d7d20a1..fe01085d 100644
--- a/docs/templates/rpmspec.txt
+++ b/docs/templates/rpmspec.txt
@@ -20,10 +20,12 @@ rpm_name = Do not provide a value, it is filled in by the RpmSpecWorkspaceCreato
 rpm_post_cmd = Sets the content of the %post section of the RPM spec file.
 rpm_postun_cmd = Sets the content of the %postun section of the RPM spec file.
 rpm_prefix = Sets the RPM spec Prefix tag.
+rpm_pre_cmd = Sets the content of the %pre section of the RPM spec file.
 rpm_preun_cmd = Sets the content of the %preun section of the RPM spec file.
 rpm_provides = Optional.  Sets the RPM spec Provides tag.
 rpm_releasenumber = Required.  Sets the RPM spec Release tag.
 rpm_requires = Optional.  Sets the RPM spec Requires tag.  These values will be used in addition to dependencies that MPC already knows due to the 'after' assignments.
 rpm_source_base = Sets the URL or path base of the RPM spec Source tag.  The RPM tarball name will be appended so it should end with a slash.
 rpm_summary = Required.  Sets the RPM spec Summary tag.
+rpm_url = Optional.  Sets the URL of the application.
 rpm_version = Required.  Sets the RPM spec Version tag.