From 989cea873c8f1689c229fae2d6addfbd08a47a9617403e154d89f5ff25a2d545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 13 Feb 2025 13:22:10 +0000 Subject: [PATCH] do not output debug messages in rpmspec -q if a buildsystem is OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=693 --- buildsys.diff | 12 ++++++++++++ rpm.changes | 3 +++ rpm.spec | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 buildsys.diff diff --git a/buildsys.diff b/buildsys.diff new file mode 100644 index 0000000..defa844 --- /dev/null +++ b/buildsys.diff @@ -0,0 +1,12 @@ +--- build/parseSpec.c.orig 2025-02-13 13:20:21.075462279 +0000 ++++ build/parseSpec.c 2025-02-13 13:15:42.447942795 +0000 +@@ -1429,7 +1429,8 @@ static rpmRC parseSpecParts(rpmSpec spec + /* rpmGlob returns files sorted */ + if (rpmGlob(pattern, &argc, &argv) == 0) { + for (int i = 0; i < argc; i++) { +- rpmlog(RPMLOG_NOTICE, "Reading %s\n", argv[i]); ++ if (state != PARSE_BUILDSYS) ++ rpmlog(RPMLOG_NOTICE, "Reading %s\n", argv[i]); + pushOFI(spec, argv[i]); + snprintf(spec->fileStack->readBuf, spec->fileStack->readBufLen, + "# Spec part read from %s\n\n", argv[i]); diff --git a/rpm.changes b/rpm.changes index 00755d3..c87dd45 100644 --- a/rpm.changes +++ b/rpm.changes @@ -11,6 +11,9 @@ Wed Feb 12 13:36:45 CET 2025 - mls@suse.de * new patch: mtime_policy_set.diff - drop unused 0001-Add-option-to-set-mtime-of-files-in-rpms.patch patch +- do not output debug messages in rpmspec -q if a buildsystem is + used + * new patch: buildsys.diff ------------------------------------------------------------------- Mon Feb 3 13:13:27 CET 2025 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 0bb6ebc..5449ef4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -125,6 +125,7 @@ Patch153: nextfiles.diff Patch154: undefbuildroot.diff Patch155: rpm2archive.diff Patch156: mtime_policy_set.diff +Patch157: buildsys.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -243,7 +244,7 @@ rm -rf sqlite %patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 138 %patch -P 139 %patch -P 141 -P 142 -%patch -P 150 -P 151 -P 152 -P 153 -P 154 -P 155 -P 156 +%patch -P 150 -P 151 -P 152 -P 153 -P 154 -P 155 -P 156 -P 157 %ifarch aarch64 ppc64le riscv64 loongarch64 %patch -P 6464