Don't run fixowner and fixgroup at end of %prep

- they'd only work for root, and we don't want to encourage people to build
  as root...
This commit is contained in:
Panu Matilainen 2008-05-08 14:36:08 +03:00
parent c5696f6019
commit c9b6fc7e2d
1 changed files with 6 additions and 12 deletions

View File

@ -363,20 +363,14 @@ static int doSetupMacro(rpmSpec spec, const char *line)
appendStringBuf(spec->prep, getStringBuf(after));
after = freeStringBuf(after);
/* XXX FIXME: owner & group fixes were conditioned on !geteuid() */
/* Fix the owner, group, and permissions of the setup build tree */
{ static const char * const fixmacs[] =
{ "%{_fixowner}", "%{_fixgroup}", "%{_fixperms}", NULL };
const char * const * fm;
for (fm = fixmacs; *fm; fm++) {
char * fix = rpmExpand(*fm, " .", NULL);
if (fix && *fix != '%')
appendLineStringBuf(spec->prep, fix);
fix = _free(fix);
/* Fix the permissions of the setup build tree */
{ char *fix = rpmExpand("%{_fixperms} .", NULL);
if (fix && *fix != '%') {
appendLineStringBuf(spec->prep, fix);
}
free(fix);
}
return RPMRC_OK;
}