Search
SailfishOS Open Build Service
>
Projects
>
home:plfiorini
:
maui:devel
:
x86_64
>
rpm
> _service:tar_git:0006-rpm-shorten-changelog.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:tar_git:0006-rpm-shorten-changelog.patch of Package rpm
From d84a5d271580c09bd34df1ef6428729edb5a9fc1 Mon Sep 17 00:00:00 2001 From: David Greaves <david@dgreaves.com> Date: Wed, 17 Apr 2013 20:41:08 +0000 Subject: [PATCH] rpm-shorten-changelog --- build/pack.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ build/parseChangelog.c | 5 +++++ 2 files changed, 63 insertions(+) diff --git a/build/pack.c b/build/pack.c index 981a03e..0934e39 100644 --- a/build/pack.c +++ b/build/pack.c @@ -671,6 +671,63 @@ static rpmRC checkPackages(char *pkgcheck) return RPMRC_OK; } +static void trimChangelog(Header h) +{ + static int oneshot; + static int cuttime, minnum, maxnum; + int * times; + char ** names = 0, ** texts = 0; + int i, keep, count = 0; + + 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 (!headerGetEntry(h, RPMTAG_CHANGELOGTIME, NULL, (void **) ×, &count)) + return; + if ((!cuttime || count <= minnum) && (!maxnum || count <= maxnum)) { + return; + } + keep = count; + if (maxnum && keep > maxnum) + keep = maxnum; + if (cuttime) { + for (i = 0; i < keep; i++) { + if (i >= minnum && times[i] < cuttime) + break; + } + keep = i; + } + if (keep >= count) + return; + headerGetEntry(h, RPMTAG_CHANGELOGNAME, NULL, (void **) &names, &count); + headerGetEntry(h, RPMTAG_CHANGELOGTEXT, NULL, (void **) &texts, &count); + headerModifyEntry(h, RPMTAG_CHANGELOGTIME, RPM_INT32_TYPE, times, keep); + headerModifyEntry(h, RPMTAG_CHANGELOGNAME, RPM_STRING_ARRAY_TYPE, names, keep); + headerModifyEntry(h, RPMTAG_CHANGELOGTEXT, RPM_STRING_ARRAY_TYPE, texts, keep); + free(names); + free(texts); +} + rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) { struct cpioSourceArchive_s csabuf; @@ -680,6 +737,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) Package pkg; char *pkglist = NULL; + trimChangelog(spec->packages->header); for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { char *fn; diff --git a/build/parseChangelog.c b/build/parseChangelog.c index d4681cb..0c02051 100644 --- a/build/parseChangelog.c +++ b/build/parseChangelog.c @@ -168,6 +168,11 @@ static rpmRC addChangelog(Header h, ARGV_const_t sb) return RPMRC_FAIL; } + /* workaround old suse oddity */ + if (*s == '-' && s[1] == ' ') { + s += 2; + } + /* name */ name = s; while (*s != '\0') s++; -- 1.8.3-rc3