Always start parsing in the preable of the main package

even on secondary parse runs. This allows declaring tags not essential
for building in dynamic spec parts.

build/parsePreamble.c

@@ -1185,11 +1185,13 @@ int parsePreamble(rpmSpec spec, int initialPackage)
 	    NVR = xstrdup(name);
 	pkg = newPackage(NVR, spec->pool, &spec->packages);
 	headerPutString(pkg->header, RPMTAG_NAME, NVR);
+    } else if (spec->sourcePackage) {
+	NVR = xstrdup("(main package)");
+	pkg = spec->packages;
     } else {
 	NVR = xstrdup("(main package)");
 	pkg = newPackage(NULL, spec->pool, &spec->packages);
 	spec->sourcePackage = newPackage(NULL, spec->pool, NULL);
-
     }
 
     if ((rc = readLine(spec, STRIP_TRAILINGSPACE | STRIP_COMMENTS)) > 0) {

build/parseSpec.c

@@ -891,12 +891,6 @@ static rpmRC parseSpecSection(rpmSpec *specptr, int secondary)
     int storedParsePart;
     int initialPackage = 1;
 
-    if (secondary) {
-	initialPackage = 0;
-	parsePart = PART_EMPTY;
-	prevParsePart = PART_NONE;
-    }
-
     /* All the parse*() functions expect to have a line pre-read */
     /* in the spec's line buffer.  Except for parsePreamble(),   */
     /* which handles the initial entry into a spec file.         */