folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New prefix handling (also take Prefixes:) 

CVS patchset: 1982
CVS date: 1998/02/03 04:30:19
This commit is contained in:
marc 1998-02-03 04:30:19 +00:00
parent 9fc5557ba4
commit 840599e3d9
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/TODO
View File

@ -9,14 +9,14 @@
posix %attr
Add Shell: rpmrc entry
some /foo/*/*.foo entries don't get matches
detect multiple summary/description entries
verify langs
remove prefix stuff from files.c (not used anymore)
=====================================================================
i18n strings

14
build/parsePreamble.c
View File

@ -366,15 +366,8 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro,
}
spec->gotBuildRoot = 1;
break;
case RPMTAG_DEFAULTPREFIX:
SINGLE_TOKEN_ONLY;
if (field[0] != '/') {
rpmError(RPMERR_BADSPEC,
"line %d: Prefix must begin with '/': %s",
spec->lineNum, spec->line);
return RPMERR_BADSPEC;
}
headerAddEntry(pkg->header, tag, RPM_STRING_TYPE, field, 1);
case RPMTAG_PREFIXES:
addOrAppendListEntry(pkg->header, tag, field);
break;
case RPMTAG_DOCDIR:
SINGLE_TOKEN_ONLY;
@ -505,7 +498,8 @@ static struct PreambleRec {
{RPMTAG_PREREQ, 0, 0, "prereq"},
{RPMTAG_CONFLICTFLAGS, 0, 0, "conflicts"},
{RPMTAG_OBSOLETES, 0, 0, "obsoletes"},
{RPMTAG_DEFAULTPREFIX, 0, 0, "prefix"},
{RPMTAG_PREFIXES, 0, 0, "prefix"},
{RPMTAG_PREFIXES, 0, 0, "prefixes"},
{RPMTAG_BUILDROOT, 0, 0, "buildroot"},
{RPMTAG_BUILDARCHS, 0, 0, "buildarchitectures"},
{RPMTAG_AUTOREQPROV, 0, 0, "autoreqprov"},