commit rpm for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package rpm for openSUSE:Factory checked in 
at 2022-05-05 23:04:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
 and      /work/SRC/openSUSE:Factory/.rpm.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rpm"

Thu May  5 23:04:17 2022 rev:297 rq:973837 version:4.17.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes  2022-04-23 19:45:01.174915791 
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.1538/rpm.changes        2022-05-05 
23:04:19.489402373 +0200
@@ -1,0 +2,8 @@
+Thu Apr 21 13:39:58 UTC 2022 - Dirk M??ller <dmuel...@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
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
rpm.spec: same change
++++++ macrosin.diff ++++++
--- /var/tmp/diff_new_pack.FF971J/_old  2022-05-05 23:04:20.961404210 +0200
+++ /var/tmp/diff_new_pack.FF971J/_new  2022-05-05 23:04:20.965404215 +0200
@@ -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    ???

++++++ rpm-shorten-changelog.diff ++++++
--- /var/tmp/diff_new_pack.FF971J/_old  2022-05-05 23:04:21.013404275 +0200
+++ /var/tmp/diff_new_pack.FF971J/_new  2022-05-05 23:04:21.017404280 +0200
@@ -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;
        }