rpm/rpm-5.2.1-spec_preprocessed_output.patch

39 lines
1.3 KiB
Diff
Raw Normal View History

diff -ru rpm-4.4.9.orig//build/parseSpec.c rpm-4.4.9/build/parseSpec.c
--- rpm-4.4.9.orig//build/parseSpec.c 2010-08-03 15:57:18.740342061 +0200
+++ rpm-4.4.9/build/parseSpec.c 2010-08-03 15:58:02.071216551 +0200
@@ -402,6 +402,12 @@
if (! spec->readStack->reading) {
spec->line[0] = '\0';
+ } else {
+ if (specedit) {
+ printf("%s",spec->line);
+ if (strchr(spec->line, '\n') == NULL && spec->line[strlen(spec->line)-1] != '\n')
+ printf("\n");
+ }
}
/*@-compmempass@*/ /* FIX: spec->readStack->next should be dependent */
--- rpm-4.4.9.orig//build/spec.c 2010-08-03 15:57:20.203092007 +0200
+++ rpm-4.4.9/build/spec.c 2010-08-03 15:56:45.128341759 +0200
@@ -724,7 +724,7 @@
res = 0;
if (specedit) {
- printNewSpecfile(spec);
+// printNewSpecfile(spec);
goto exit;
}
--- rpm-4.4.9.orig/build/parsePreamble.c 2007-05-15 02:39:25.000000000 +0200
+++ rpm-4.4.9/build/parsePreamble.c 2010-08-03 18:24:43.614092066 +0200
@@ -951,7 +951,7 @@
}
if (handlePreambleTag(spec, pkg, tag, macro, lang))
return RPMRC_FAIL;
- if (spec->BANames && !spec->recursing && spec->toplevel)
+ if (spec->BANames && !spec->recursing && spec->toplevel && !specedit)
return PART_BUILDARCHITECTURES;
}
if ((rc =