diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-06-21 14:43:03 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-06-21 14:43:03 +0300 |
| commit | a91dd90e6fce4745f164ad1feac6f1b4c929f657 (patch) | |
| tree | b6f12e42009bfbab1ab042d89744175acb29054a /build | |
| parent | 2c7f83867cffcdc7d11a0fd60599f6153be829fb (diff) | |
| download | librpm-tizen-a91dd90e6fce4745f164ad1feac6f1b4c929f657.tar.gz librpm-tizen-a91dd90e6fce4745f164ad1feac6f1b4c929f657.tar.bz2 librpm-tizen-a91dd90e6fce4745f164ad1feac6f1b4c929f657.zip | |
Eliminate redundant special docs tracking members in filelist
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/build/files.c b/build/files.c index 6b0217f75..44c22308a 100644 --- a/build/files.c +++ b/build/files.c @@ -103,9 +103,6 @@ typedef struct FileList_s { int processingFailed; - int passedSpecialDoc; - int isSpecialDoc; - int noGlob; unsigned devtype; unsigned devmajor; @@ -933,7 +930,7 @@ static rpmRC parseForSimple(rpmSpec spec, Package pkg, char * buf, res = RPMRC_FAIL; } else { /* XXX FIXME: this is easy to do as macro expansion */ - if (! fl->passedSpecialDoc) { + if (pkg->specialDoc == NULL) { char *mkdocdir = rpmExpand("%{__mkdir_p} $DOCDIR", NULL); pkg->specialDoc = newStringBuf(); appendStringBuf(pkg->specialDoc, "DOCDIR=$RPM_BUILD_ROOT"); @@ -943,8 +940,6 @@ static rpmRC parseForSimple(rpmSpec spec, Package pkg, char * buf, free(mkdocdir); *fileName = pkg->specialDocDir; - fl->passedSpecialDoc = 1; - fl->isSpecialDoc = 1; } appendStringBuf(pkg->specialDoc, "cp -pr "); @@ -1768,9 +1763,6 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, fl.processingFailed = 0; - fl.passedSpecialDoc = 0; - fl.isSpecialDoc = 0; - fl.isDir = 0; fl.currentFlags = 0; fl.currentVerifyFlags = 0; @@ -1821,7 +1813,6 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, /* turn explicit flags into %def'd ones (gosh this is hacky...) */ fl.currentSpecdFlags = ((unsigned)fl.defSpecdFlags) >> 8; fl.currentVerifyFlags = fl.defVerifyFlags; - fl.isSpecialDoc = 0; fl.noGlob = 0; fl.devtype = 0; @@ -1857,9 +1848,8 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, if (fileName == NULL) continue; - if (fl.isSpecialDoc) { + if (pkg->specialDoc && specialDoc == NULL) { /* Save this stuff for last */ - free(specialDoc); specialDoc = xstrdup(fileName); dupAttrRec(&fl.cur_ar, specialDocAttrRec); } else if (fl.currentFlags & RPMFILE_PUBKEY) { |