From 8ce6b04909bec16a2b8470a015e7e3573263d41d57450abb68fd24484f228fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 24 Sep 2021 09:12:48 +0000 Subject: [PATCH] fix singlefilemode in patches OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=586 --- rpm.changes | 1 + rpm.spec | 3 ++- singlefilemode.diff | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 singlefilemode.diff diff --git a/rpm.changes b/rpm.changes index 4174860..6a8728c 100644 --- a/rpm.changes +++ b/rpm.changes @@ -11,6 +11,7 @@ Thu Sep 23 20:57:45 CEST 2021 - mls@suse.de - easier rpm macro access in lua - new patches: * python-rpm-packaging.diff + * singlefilemode.diff - modified patches: * usr-lib-sysimage-rpm.patch * localetag.diff diff --git a/rpm.spec b/rpm.spec index c0dc130..7e24299 100644 --- a/rpm.spec +++ b/rpm.spec @@ -119,6 +119,7 @@ Patch201: finddebuginfo-absolute-links.diff Patch202: debugsubpkg.diff Patch203: debuglink.diff Patch204: debuginfo-mono.patch +Patch205: singlefilemode.diff Patch300: python-rpm-packaging.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -244,7 +245,7 @@ rm -rf sqlite # debugedit patches pushd debugedit-5.0 -%patch -P 200 -P 201 -P 202 -P 203 -P 204 +%patch -P 200 -P 201 -P 202 -P 203 -P 204 -P 205 popd # python-rpm-packaging patches diff --git a/singlefilemode.diff b/singlefilemode.diff new file mode 100644 index 0000000..c1aa259 --- /dev/null +++ b/singlefilemode.diff @@ -0,0 +1,10 @@ +--- ./scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000 ++++ ./scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000 +@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do + ;; + --dwz-single-file-mode) + dwz_single_file_mode=true +- shift + ;; + --build-id-seed) + build_id_seed=$2