--- build/pack.c.orig +++ build/pack.c @@ -683,6 +683,71 @@ return rc; } +static void trimChangelog(Header h) +{ + static int oneshot; + static int cuttime, minnum, maxnum; + rpm_count_t i, keep; + struct rpmtd_s timestd, namestd, textstd; + rpm_count_t count; + + if (!oneshot) { + char *binarychangelogtrim = rpmExpand("%{?_binarychangelogtrim}", NULL); + oneshot = 1; + if (binarychangelogtrim && *binarychangelogtrim) { + maxnum = atoi(binarychangelogtrim); + binarychangelogtrim = strchr(binarychangelogtrim, ','); + if (binarychangelogtrim) + binarychangelogtrim++; + } + if (binarychangelogtrim && *binarychangelogtrim) { + cuttime = atoi(binarychangelogtrim); + binarychangelogtrim = strchr(binarychangelogtrim, ','); + if (binarychangelogtrim) + binarychangelogtrim++; + } + if (binarychangelogtrim && *binarychangelogtrim) { + minnum = atoi(binarychangelogtrim); + binarychangelogtrim = strchr(binarychangelogtrim, ','); + } + } + if (!cuttime && !minnum && !maxnum) { + return; + } + + if (!headerGet(h, RPMTAG_CHANGELOGTIME, ×td, HEADERGET_MINMEM)) + return; + count = rpmtdCount(×td); + if ((!cuttime || count <= minnum) && (!maxnum || count <= maxnum)) { + rpmtdFreeData(×td); + return; + } + keep = count; + if (maxnum && keep > maxnum) + keep = maxnum; + if (cuttime) { + for (i = 0; i < keep; i++) { + uint32_t *tp = rpmtdNextUint32(×td); + if (i >= minnum && tp && *tp < cuttime) + break; + } + keep = i; + } + if (keep >= count) { + rpmtdFreeData(×td); + return; + } + headerGet(h, RPMTAG_CHANGELOGNAME, &namestd, HEADERGET_MINMEM); + headerGet(h, RPMTAG_CHANGELOGTEXT, &textstd, HEADERGET_MINMEM); + timestd.count = namestd.count = textstd.count = keep; + headerMod(h, ×td); + headerMod(h, &namestd); + headerMod(h, &textstd); + rpmtdFreeData(&textstd); + rpmtdFreeData(&namestd); + rpmtdFreeData(×td); +} + static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename) { rpmRC rc = RPMRC_OK; @@ -699,7 +764,10 @@ /* Copy changelog from src rpm */ #pragma omp critical - headerCopyTags(spec->sourcePackage->header, pkg->header, copyTags); + { + headerCopyTags(spec->sourcePackage->header, pkg->header, copyTags); + trimChangelog(pkg->header); + } headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION); headerPutString(pkg->header, RPMTAG_BUILDHOST, spec->buildHost); --- build/parseChangelog.c.orig +++ build/parseChangelog.c @@ -267,6 +267,11 @@ goto exit; } + /* workaround old suse oddity */ + if (*s == '-' && s[1] == ' ') { + s += 2; + } + /* name */ name = s; while (*s != '\0') s++;