testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 972219 from home:dirkmueller:branches:Base:System

Browse Source 
- update rpm-shorten-changelog.diff: fix shortening of changelog,
  the non-primary binary packages had the full changelog
- update macrosin.diff: remove binarychangelog cutoff setting,
  this comes from rpm-config-SUSE now

OBS-URL: https://build.opensuse.org/request/show/972219
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=604
This commit is contained in:
Michael Schröder 2022-04-22 14:53:05 +00:00 committed by Git OBS Bridge
parent 79f9d56fb8
commit 49c4aab8f8
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
macrosin.diff
View File

@ -79,17 +79,6 @@
#
# Use internal dependency generator rather than external helpers?
@@ -554,6 +570,10 @@ package or when debugging this package.\
# Directories whose contents should be considered as documentation.
%__docdir_path %{_datadir}/doc:%{_datadir}/man:%{_datadir}/info:%{_datadir}/gtk-doc/html:%{_datadir}/gnome/help:%{?_docdir}:%{?_mandir}:%{?_infodir}:%{?_javadocdir}:/usr/doc:/usr/man:/usr/info:/usr/X11R6/man
+# maxnum,cuttime,minnum
+# 2014/10/13 (SLES12 GA)
+%_binarychangelogtrim 0,1413151200,10
+
#
# Path to scripts to autogenerate package dependencies,
#
@@ -564,6 +584,7 @@ package or when debugging this package.\
%__find_requires %{_rpmconfigdir}/find-requires
#%__find_conflicts ???

37
rpm-shorten-changelog.diff
View File

@ -1,6 +1,6 @@
--- ./build/pack.c.orig 2020-09-30 12:49:33.397074156 +0000
+++ ./build/pack.c 2020-09-30 12:51:34.628805840 +0000
@@ -728,6 +728,71 @@ static rpmRC packageBinary(rpmSpec spec,
--- ./build/pack.c
+++ ./build/pack.c
@@ -683,6 +683,71 @@
return rc;
}
@ -69,21 +69,24 @@
+ rpmtdFreeData(&timestd);
+}
+
static int compareBinaries(const void *p1, const void *p2) {
Package pkg1 = *(Package *)p1;
Package pkg2 = *(Package *)p2;
@@ -751,6 +816,8 @@ rpmRC packageBinaries(rpmSpec spec, cons
Package *tasks;
int npkgs = 0;
static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename)
{
rpmRC rc = RPMRC_OK;
@@ -699,7 +764,10 @@
+ trimChangelog(spec->packages->header);
+
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next)
npkgs++;
tasks = xcalloc(npkgs, sizeof(Package));
--- ./build/parseChangelog.c.orig 2020-08-31 09:14:07.991087349 +0000
+++ ./build/parseChangelog.c 2020-09-30 12:49:33.401074147 +0000
@@ -267,6 +267,11 @@ static rpmRC addChangelog(Header h, ARGV
/* 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
+++ ./build/parseChangelog.c
@@ -267,6 +267,11 @@
goto exit;
}

8
rpm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 21 13:39:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update rpm-shorten-changelog.diff: fix shortening of changelog,
the non-primary binary packages had the full changelog
- update macrosin.diff: remove binarychangelog cutoff setting,
this comes from rpm-config-SUSE now
-------------------------------------------------------------------
Wed Mar 30 08:54:50 UTC 2022 - Martin Liška <mliska@suse.cz>