Michael Schröder
84b19fafa8
* needed to fix bsc#218459 * updated patch: posttrans.diff - backport architecture check fix from upstream * new patch: archcheck.diff - backport empty password fix from upstream * new patch: emptypw.diff - backport buildsys specific prep fix from upstream * new patch: buildsysprep.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=700
34 lines
1006 B
Diff
34 lines
1006 B
Diff
--- build/parseSpec.c.orig 2025-04-25 09:58:26.712300888 +0000
|
|
+++ build/parseSpec.c 2025-04-25 09:58:54.224255916 +0000
|
|
@@ -987,7 +987,7 @@ int checkBuildsystem(rpmSpec spec, const
|
|
}
|
|
|
|
static rpmRC parseBuildsysSect(rpmSpec spec, const char *prefix,
|
|
- struct sectname_s *sc, FD_t fd)
|
|
+ struct sectname_s *sc, FD_t fd, int *foundp)
|
|
{
|
|
rpmRC rc = RPMRC_OK;
|
|
|
|
@@ -1015,6 +1015,7 @@ static rpmRC parseBuildsysSect(rpmSpec s
|
|
}
|
|
free(buf);
|
|
free(args);
|
|
+ *foundp = 1;
|
|
}
|
|
free(mn);
|
|
}
|
|
@@ -1038,9 +1039,10 @@ static rpmRC parseBuildsystem(rpmSpec sp
|
|
}
|
|
|
|
for (struct sectname_s *sc = sectList; !rc && sc->name; sc++) {
|
|
- rc = parseBuildsysSect(spec, buildsystem, sc, fd);
|
|
- if (!rc && spec->sections[sc->section] == NULL)
|
|
- rc = parseBuildsysSect(spec, "default", sc, fd);
|
|
+ int found = 0;
|
|
+ rc = parseBuildsysSect(spec, buildsystem, sc, fd, &found);
|
|
+ if (!rc && !found)
|
|
+ rc = parseBuildsysSect(spec, "default", sc, fd, &found);
|
|
}
|
|
|
|
if (!rc)
|