Allow whitespace before directives in the Preamble

Resolves: #2927

build/parsePreamble.c

@@ -293,7 +293,9 @@ int addSource(rpmSpec spec, int specline, const char *srcname, rpmTagVal tag)
     }
 
     if (specline) {
-	nonum = parseTagNumber(spec->line + strlen(name), &num);
+	char * s = spec->line;
+	SKIPSPACE(s);
+	nonum = parseTagNumber(s + strlen(name), &num);
 	if (nonum < 0) {
 	    rpmlog(RPMLOG_ERR, _("line %d: Bad %s number: %s\n"),
 		     spec->lineNum, name, spec->line);
@@ -1133,10 +1135,11 @@ static struct PreambleRec_s const preambleList[] = {
 static int findPreambleTag(rpmSpec spec, PreambleRec * pr, const char ** macro, char * lang)
 {
     PreambleRec p;
-    char *s;
+    char *s = spec->line;
+    SKIPSPACE(s);
 
     for (p = preambleList; p->token != NULL; p++) {
-	if (!(p->token && !rstrncasecmp(spec->line, p->token, p->len)))
+	if (!(p->token && !rstrncasecmp(s, p->token, p->len)))
 	    continue;
 	if (p->deprecated) {
 	    rpmlog(RPMLOG_WARNING, _("line %d: %s is deprecated: %s\n"),
@@ -1147,7 +1150,7 @@ static int findPreambleTag(rpmSpec spec, PreambleRec * pr, const char ** macro,
     if (p == NULL || p->token == NULL)
 	return 1;
 
-    s = spec->line + p->len;
+    s = s + p->len;
     SKIPSPACE(s);
 
     switch (p->type) {

docs/manual/spec.md

@@ -75,6 +75,10 @@ if used in them.
 
 ### Preamble tags
 
+Since RPM 4.20 preamble tags can be indented with white space. Older
+versions require the Tags to be at the beginning of a line. Comments
+and empty lines are allowed.
+
 #### Name
 
 The Name tag contains the proper name of the package. Names must not

tests/data/SPECS/hello.spec

@@ -5,16 +5,16 @@
 # package which can be built under runroot in the test-suite.
 
 Summary: hello -- hello, world rpm
-Name: hello
+ Name: hello
 Version: 1.0
-Release: 1
-Group: Utilities
+	Release: 1
+ Group: Utilities
 License: GPL
 SourceLicense: GPL, ASL 1.0
 Distribution: RPM test suite.
 URL: http://rpm.org
-Source0: hello-1.0.tar.gz
-Patch0: hello-1.0-modernize.patch
+	Source0: hello-1.0.tar.gz
+ Patch0: hello-1.0-modernize.patch
 Prefix: /usr
 
 %description

tests/rpmspec.at

@@ -310,16 +310,16 @@ runroot rpmspec --parse \
 
 
 Summary: hello -- hello, world rpm
-Name: hello
+ Name: hello
 Version: 1.0
-Release: 1
-Group: Utilities
+	Release: 1
+ Group: Utilities
 License: GPL
 SourceLicense: GPL, ASL 1.0
 Distribution: RPM test suite.
 URL: http://rpm.org
-Source0: hello-1.0.tar.gz
-Patch0: hello-1.0-modernize.patch
+	Source0: hello-1.0.tar.gz
+ Patch0: hello-1.0-modernize.patch
 Prefix: /usr
 
 %description