From e0b7e44ebe0963296cf756b1a91a2e78aa80be963712e48e4cf1c8538290b56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Thu, 10 Aug 2023 09:47:45 +0000
Subject: [PATCH] Accepting request 1102895 from
 home:dirkmueller:branches:Base:System

- add remove-awk-dependency.patch to be able to drop awk dependency
  from containers

OBS-URL: https://build.opensuse.org/request/show/1102895
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=638
---
 remove-awk-dependency.patch | 11 +++++++++++
 rpm.changes                 |  6 ++++++
 rpm.spec                    |  6 +++---
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 remove-awk-dependency.patch

diff --git a/remove-awk-dependency.patch b/remove-awk-dependency.patch
new file mode 100644
index 0000000..88d5999
--- /dev/null
+++ b/remove-awk-dependency.patch
@@ -0,0 +1,11 @@
+--- rpmpopt.in.orig	2022-04-07 13:13:19.072518377 +0200
++++ rpmpopt.in	2023-08-08 13:45:57.992531046 +0200
+@@ -125,7 +125,7 @@
+ 	--POPTdesc=$"list filetrigger scriptlets from package(s)"
+ 
+ rpm	alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NVRA} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
+-	--pipe "LC_NUMERIC=C sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-45s %-s\n\", $1, substr($0,length($1)+2))}' " \
++	--pipe "LC_NUMERIC=C sort -r -n | sed -E 's,^[0-9]+ ([^[:blank:]]+) +(.+)$,printf "'"%-45s %s\n"'" \1 "'"\2"'",e'" \
+ 	--POPTdesc=$"list package(s) by install time, most recent first"
+ 
+ rpm	alias --dupes   --qf '%|SOURCERPM?{%{name}.%{arch}}:{%|ARCH?{%{name}}:{%{name}-%{version}}|}|\n' --pipe "sort | uniq -d" \
diff --git a/rpm.changes b/rpm.changes
index 7d7903b..f45b4e3 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  8 12:39:25 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- add remove-awk-dependency.patch to be able to drop awk dependency
+  from containers
+
 -------------------------------------------------------------------
 Tue May 30 09:07:28 UTC 2023 - Jiri Srain <jsrain@suse.com>
 
diff --git a/rpm.spec b/rpm.spec
index 1ef4a23..0d6a74a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -53,8 +53,6 @@ BuildRequires:  pkgconfig(zlib)
 Provides:       rpminst
 Requires(post): %fillup_prereq
 Requires:       rpm-config-SUSE
-# awk is needed for rpm --last
-Requires:       /usr/bin/awk
 Summary:        The RPM Package Manager
 License:        GPL-2.0-or-later
 Group:          System/Packages
@@ -113,6 +111,7 @@ Patch135:       selinux_transactional_update.patch
 Patch136:       x86_64-microarchitectures.patch
 Patch137:       cpuid_lzcnt.patch
 Patch138:       libmagic-exceptions.patch
+Patch139:       remove-awk-dependency.patch
 # touches a generated file
 Patch180:       whatrequires-doc.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
@@ -224,7 +223,8 @@ rm -rf sqlite
 %patch -P 100        -P 102 -P 103
 %patch                                                  -P 117
 %patch -P 122 -P 123
-%patch -P 131          -P 133 -P 134 -P 135 -P 136 -P 137 -P 138 -P 180
+%patch -P 131          -P 133 -P 134 -P 135 -P 136 -P 137 -P 138 -P 139
+%patch -P 180
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464