Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2023-08-13 19:17:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Sun Aug 13 19:17:32 2023 rev:309 rq:1103306 version:4.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2023-06-04 00:11:24.973108484 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new.11712/rpm.changes 2023-08-13 19:17:33.303952038 +0200 @@ -1,0 +2,6 @@ +Tue Aug 8 12:39:25 UTC 2023 - Dirk Müller <[email protected]> + +- add remove-awk-dependency.patch to be able to drop awk dependency + from containers + +------------------------------------------------------------------- New: ---- remove-awk-dependency.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.zha423/_old 2023-08-13 19:17:34.831961814 +0200 +++ /var/tmp/diff_new_pack.zha423/_new 2023-08-13 19:17:34.835961839 +0200 @@ -53,8 +53,6 @@ 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 @@ 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 @@ %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 ++++++ remove-awk-dependency.patch ++++++ >From 224095542246e762617d38e2096fdeba13d266e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= <[email protected]> Date: Tue, 8 Aug 2023 13:53:38 +0200 Subject: [PATCH] Rewrite --last to just use sed for formatting This is the only dependency on awk in the runtime commandline part of rpm, which is bloating minimal container images a bit. We can rewrite that into a single sed statement. We love you anyway, awk. --- rpmpopt.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpmpopt.in b/rpmpopt.in index 8022b0f54a..1223e1a862 100644 --- ./rpmpopt.in +++ ./rpmpopt.in @@ -133,8 +133,8 @@ rpm alias --filetriggerscripts --qf '\ rpm alias --filetriggers --filetriggerscripts \ --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))}' " \ +rpm alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %-45{NVRA} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \ + --pipe "LC_NUMERIC=C sort -r -n | sed 's,^[0-9]\+ ,,' " \ --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" \
