From c7cc7d0d09209b6e6a51fb8bca4182060ac4e313ff899509c13eeda9e21dbae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Wed, 22 Jun 2022 11:52:03 +0000
Subject: [PATCH] Accepting request 980501 from home:dirkmueller:Factory

- drop requires-ge-macro.diff: this is already in rpm-config-SUSE
- enable-postin-scripts-error.diff: refresh

OBS-URL: https://build.opensuse.org/request/show/980501
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=607
---
 enable-postin-scripts-error.diff | 20 ++++++++++----------
 requires-ge-macro.diff           | 12 ------------
 rpm.changes                      |  6 ++++++
 rpm.spec                         |  3 +--
 4 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 requires-ge-macro.diff

diff --git a/enable-postin-scripts-error.diff b/enable-postin-scripts-error.diff
index ca46a07..eb2505c 100644
--- a/enable-postin-scripts-error.diff
+++ b/enable-postin-scripts-error.diff
@@ -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
diff --git a/requires-ge-macro.diff b/requires-ge-macro.diff
deleted file mode 100644
index d24831f..0000000
--- a/requires-ge-macro.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./macros.in.orig	2019-10-02 11:33:19.956358174 +0000
-+++ ./macros.in	2019-10-02 11:35:01.496144862 +0000
-@@ -1312,5 +1312,9 @@ end}
- %{expand:%__scm_setup_%{__scm} %{!-v:-q}}\
- %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}
- 
-+# XXX: to be moved to rpm-config-SUSE
-+%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")
-+
- # \endverbatim
- #*/
diff --git a/rpm.changes b/rpm.changes
index 8265832..b6f1a6c 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 31 19:58:07 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- drop requires-ge-macro.diff: this is already in rpm-config-SUSE 
+- enable-postin-scripts-error.diff: refresh
+
 -------------------------------------------------------------------
 Thu Apr 21 13:39:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/rpm.spec b/rpm.spec
index a6a0d2e..60e5e9b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,7 +90,6 @@ Patch38:        build.diff
 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 @@ rm -rf sqlite
 %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