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

Erm, actually mark the special %license files as RPMFILE_LICENSE 

- Somehow I thought this already got done somewhere... the new special
  %license files need to be marked as RPMFILE_LICENSE for easy querying.
This commit is contained in:
Panu Matilainen 2012-11-08 10:20:24 +02:00
parent 829d922abe
commit 5998b02665
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/files.c
View File

@ -1147,7 +1147,7 @@ static void genCpioListAndHeader(FileList fl,
flp->flags |= RPMFILE_DOC; flp->flags |= RPMFILE_DOC;
/* XXX Should directories have %doc/%config attributes? (#14531) */ /* XXX Should directories have %doc/%config attributes? (#14531) */
if (S_ISDIR(flp->fl_mode)) if (S_ISDIR(flp->fl_mode))
flp->flags &= ~(RPMFILE_CONFIG|RPMFILE_DOC); flp->flags &= ~(RPMFILE_CONFIG|RPMFILE_DOC|RPMFILE_LICENSE);
/* Strip internal parse data */ /* Strip internal parse data */
flp->flags &= PARSEATTR_MASK; flp->flags &= PARSEATTR_MASK;
@ -1780,6 +1780,7 @@ static void processSpecialDir(rpmSpec spec, Package pkg, FileList fl,
/* Reset for %doc */ /* Reset for %doc */
FileEntryFree(&fl->cur); FileEntryFree(&fl->cur);
fl->cur.attrFlags |= sd->sdtype;
fl->cur.verifyFlags = fl->def.verifyFlags; fl->cur.verifyFlags = fl->def.verifyFlags;
dupAttrRec(&(sd->ar), &(fl->cur.ar)); dupAttrRec(&(sd->ar), &(fl->cur.ar));
dupAttrRec(&(sd->def_ar), &(fl->def.ar)); dupAttrRec(&(sd->def_ar), &(fl->def.ar));