diff --git a/.files b/.files
index dc31ad0..3fcbd15 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d759b2d..3ee6f7b 100644
--- a/.rev
+++ b/.rev
@@ -2334,4 +2334,15 @@ See bugzilla 1167537 for the gory details.
Automatic submission by obs-autosubmit
971138
+
+ cf372c7d9a416d8664aef9cb62b355d5
+ 4.17.0
+
+ dimstar_suse
+ - 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
+ 973837
+
diff --git a/macrosin.diff b/macrosin.diff
index f14ff8a..627e3ef 100644
--- a/macrosin.diff
+++ b/macrosin.diff
@@ -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 ???
diff --git a/rpm-shorten-changelog.diff b/rpm-shorten-changelog.diff
index 39a48c0..ed140ae 100644
--- a/rpm-shorten-changelog.diff
+++ b/rpm-shorten-changelog.diff
@@ -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(×td);
+}
+
- 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;
}
diff --git a/rpm.changes b/rpm.changes
index ade5038..743fefe 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Apr 21 13:39:58 UTC 2022 - Dirk Müller
+
+- 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
- Update zstdpool.diff in order to fix boo#1197643.