summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2010-12-21 18:29:09 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2010-12-21 18:29:09 +0000
commit724a6165129c938bdde53684f3328c5645422559 (patch)
treef7fd9875ef8040c89e037a54e4ed3a9c700c27e5
parent9486ad0ee0f9f39d45d4b8c4b4d1aaf3b02bca5d (diff)
downloadMPC-724a6165129c938bdde53684f3328c5645422559.tar.gz
fixed bug in document_template.pl and added 'Required.' where applicable in rpmspec.txt
-rwxr-xr-xdevtools/document_template.pl8
-rw-r--r--docs/templates/rpmspec.txt10
2 files changed, 10 insertions, 8 deletions
diff --git a/devtools/document_template.pl b/devtools/document_template.pl
index 84c375fd..d67d941d 100755
--- a/devtools/document_template.pl
+++ b/devtools/document_template.pl
@@ -234,9 +234,11 @@ if (open($fh, $input)) {
my $skip = $inputIsPerl;
while(<$fh>) {
- $skip = 0 if ($skip && /$startPattern/);
- $skip = 1 if (!$skip && /$endPattern/);
- next if $skip;
+ if ($inputIsPerl) {
+ $skip = 0 if ($skip && /$startPattern/);
+ $skip = 1 if (!$skip && /$endPattern/);
+ next if $skip;
+ }
my $len = length($_);
for(my $start = 0; $start < $len;) {
diff --git a/docs/templates/rpmspec.txt b/docs/templates/rpmspec.txt
index 4762dc59..f5b1a297 100644
--- a/docs/templates/rpmspec.txt
+++ b/docs/templates/rpmspec.txt
@@ -10,8 +10,8 @@ mkgen_args = Additional arguments to pass to the makefile_generator.
prebuild = Additional command to run in the %build section of the RPM spec (before makefile_generator).
rpm_autorequiresprovides = Sets the RPM spec AutoReqProv tag.
rpm_buildrequires = Optional. Sets the RPM spec BuildRequires tag.
-rpm_description = Sets the content of the %description section of the RPM spec file. Multiple lines can be separated by \n.
-rpm_group = Sets the RPM spec Group tag.
+rpm_description = Required. Sets the content of the %description section of the RPM spec file. Multiple lines can be separated by \n.
+rpm_group = Required. Sets the RPM spec Group tag.
rpm_license = Sets the RPM spec License tag.
rpm_mpc_requires = Do not provide a value, it is filled in by the RpmSpecWorkspaceCreator.
rpm_mpc_temp = Temporary directory for building RPMs.
@@ -22,8 +22,8 @@ rpm_postun_cmd = Sets the content of the %postun section of the RPM spec file.
rpm_prefix = Sets the RPM spec Prefix tag.
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 = Sets the RPM spec Release 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 = Sets the RPM spec Summary tag.
-rpm_version = Sets the RPM spec Version tag.
+rpm_summary = Required. Sets the RPM spec Summary tag.
+rpm_version = Required. Sets the RPM spec Version tag.