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-06-25 10:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Sat Jun 25 10:23:32 2022 rev:298 rq:984473 version:4.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2022-05-05 23:04:19.489402373
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.1548/rpm.changes 2022-06-25
10:23:34.094614306 +0200
@@ -1,0 +2,6 @@
+Tue May 31 19:58:07 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- drop requires-ge-macro.diff: this is already in rpm-config-SUSE
+- enable-postin-scripts-error.diff: refresh
+
+-------------------------------------------------------------------
Old:
----
requires-ge-macro.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.CLTAEc/_old 2022-06-25 10:23:35.598616453 +0200
+++ /var/tmp/diff_new_pack.CLTAEc/_new 2022-06-25 10:23:35.602616459 +0200
@@ -90,7 +90,6 @@
Patch43: rpm-shorten-changelog.diff
Patch45: whatrequires-doc.diff
Patch46: remove-brp-strips.diff
-Patch47: requires-ge-macro.diff
Patch51: specfilemacro.diff
Patch60: safeugid.diff
Patch61: noprereqdeprec.diff
@@ -238,7 +237,7 @@
%patch -P 5 -P 12 -P 13 -P 16 -P 18
%patch -P 24 -P 25 -P 26 -P 29
%patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38
-%patch -P 43 -P 45 -P 46 -P 47
+%patch -P 43 -P 45 -P 46
%patch -P 51
%patch -P 60 -P 61 -P 66 -P 67 -P 69
%patch -P 70 -P 71 -P 73 -P 77 -P 78 -P 79
++++++ enable-postin-scripts-error.diff ++++++
--- /var/tmp/diff_new_pack.CLTAEc/_old 2022-06-25 10:23:35.686616579 +0200
+++ /var/tmp/diff_new_pack.CLTAEc/_new 2022-06-25 10:23:35.690616584 +0200
@@ -1,6 +1,6 @@
---- ./lib/rpmscript.c.orig 2019-10-02 12:19:15.694519983 +0000
-+++ ./lib/rpmscript.c 2019-10-02 12:22:32.838112185 +0000
-@@ -411,7 +411,7 @@ rpmRC rpmScriptRun(rpmScript script, int
+--- ./lib/rpmscript.c
++++ ./lib/rpmscript.c
+@@ -390,7 +390,7 @@ rpmRC rpmScriptRun(rpmScript script, int
if (script == NULL) return RPMRC_OK;
ARGV_t args = NULL;
@@ -9,7 +9,7 @@
RPMLOG_ERR : RPMLOG_WARNING;
rpmRC rc;
int script_type = RPMSCRIPTLET_FORK | RPMSCRIPTLET_EXEC;
-@@ -654,5 +654,8 @@ rpmscriptTypes rpmScriptType(rpmScript s
+@@ -637,5 +637,8 @@ rpmscriptTypes rpmScriptType(rpmScript s
rpmscriptFlags rpmScriptFlags(rpmScript script)
{
@@ -19,13 +19,13 @@
+ flags |= RPMSCRIPT_FLAG_CRITICAL;
+ return flags;
}
---- ./macros.in.orig 2019-10-02 12:12:13.027399050 +0000
-+++ ./macros.in 2019-10-02 12:12:19.799384783 +0000
-@@ -1318,5 +1318,10 @@ end}
- %requires_eq() %(echo '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires:
%%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' |
grep -v "is not")
- %requires_ge() %(echo '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires:
%%{name} >= %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' |
grep -v "is not")
+--- ./macros.in
++++ ./macros.in
+@@ -1293,5 +1293,10 @@ end
+ %{expand:%__scm_setup_%{__scm} %{!-v:-q}}\
+ %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}
-+# Should errors in %post scriptlet be propagated as errors?
++# Should errors in %post scriptlet be propagated as errors?
+#
+# Note: set to 1 for legacy compatibility.
+%_fail_on_postinstall_errors 0
