diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-11-08 10:20:24 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-11-08 10:59:57 +0200 |
| commit | 6c4a0d29ee862b3dbb888679f178d15fb6ed73b2 (patch) | |
| tree | f9bb1d38accaee02a448b4e46155a32a9bf6187e | |
| parent | 3cc768e72cbd5a40cc7745c71cd8fac1164f80ae (diff) | |
| download | rpm-6c4a0d29ee862b3dbb888679f178d15fb6ed73b2.tar.gz rpm-6c4a0d29ee862b3dbb888679f178d15fb6ed73b2.tar.bz2 rpm-6c4a0d29ee862b3dbb888679f178d15fb6ed73b2.zip | |
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.
(cherry picked from commit 5998b02665c30a5b560f8fe899c19235f9299bd0)
| -rw-r--r-- | build/files.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/files.c b/build/files.c index 84a164316..d299cb9cd 100644 --- a/build/files.c +++ b/build/files.c @@ -1147,7 +1147,7 @@ static void genCpioListAndHeader(FileList fl, flp->flags |= RPMFILE_DOC; /* XXX Should directories have %doc/%config attributes? (#14531) */ if (S_ISDIR(flp->fl_mode)) - flp->flags &= ~(RPMFILE_CONFIG|RPMFILE_DOC); + flp->flags &= ~(RPMFILE_CONFIG|RPMFILE_DOC|RPMFILE_LICENSE); /* Strip internal parse data */ flp->flags &= PARSEATTR_MASK; @@ -1780,6 +1780,7 @@ static void processSpecialDir(rpmSpec spec, Package pkg, FileList fl, /* Reset for %doc */ FileEntryFree(&fl->cur); + fl->cur.attrFlags |= sd->sdtype; fl->cur.verifyFlags = fl->def.verifyFlags; dupAttrRec(&(sd->ar), &(fl->cur.ar)); dupAttrRec(&(sd->def_ar), &(fl->def.ar)); |