Michael Schröder
cebe6dd1a8
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
--- ./build/pack.c.orig 2011-02-15 13:03:56.000000000 +0000
|
|
+++ ./build/pack.c 2011-05-11 15:35:07.000000000 +0000
|
|
@@ -671,6 +671,63 @@ static rpmRC checkPackages(char *pkgchec
|
|
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, cons
|
|
Package pkg;
|
|
char *pkglist = NULL;
|
|
|
|
+ trimChangelog(spec->packages->header);
|
|
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
|
|
char *fn;
|
|
|
|
--- ./build/parseChangelog.c.orig 2010-12-03 12:11:57.000000000 +0000
|
|
+++ ./build/parseChangelog.c 2011-05-11 15:33:22.000000000 +0000
|
|
@@ -168,6 +168,11 @@ static rpmRC addChangelog(Header h, ARGV
|
|
return RPMRC_FAIL;
|
|
}
|
|
|
|
+ /* workaround old suse oddity */
|
|
+ if (*s == '-' && s[1] == ' ') {
|
|
+ s += 2;
|
|
+ }
|
|
+
|
|
/* name */
|
|
name = s;
|
|
while (*s != '\0') s++;
|