From f8fca5b06c28a18222d09163f9fb595da596c43d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 24 Mar 2021 10:10:26 +0100 Subject: [PATCH] - improve debuginfo handling: put /usr/lib/.build-id/ in debug packages, enable debug subpackages, enable split debugsource packages - rel 5 --- rpm-debuginfo.patch | 24 ++++++++++++++++++++++++ rpm.spec | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch index aecf32e..fbe2dfc 100644 --- a/rpm-debuginfo.patch +++ b/rpm-debuginfo.patch @@ -12,3 +12,27 @@ chmod 444 "$1" || exit } +--- rpm-4.16.1.3/macros.in.orig 2021-03-24 09:50:21.000000000 +0100 ++++ rpm-4.16.1.3/macros.in 2021-03-24 10:05:10.129698408 +0100 +@@ -534,7 +534,7 @@ + # Same as for "separate" but if the __debug_package global is set then + # the -debuginfo package will have a compatibility link for the main + # ELF /usr/lib/debug/.build-id/xx/yyy -> /usr/lib/.build-id/xx/yyy +-%_build_id_links compat ++%_build_id_links alldebug + + # Whether build-ids should be made unique between package version/releases + # when generating debuginfo packages. If set to 1 this will pass +@@ -563,10 +563,10 @@ + %_unique_debug_srcs 1 + + # Whether rpm should put debug source files into its own subpackage +-#%_debugsource_packages 1 ++%_debugsource_packages 1 + + # Whether rpm should create extra debuginfo packages for each subpackage +-#%_debuginfo_subpackages 1 ++%_debuginfo_subpackages 1 + + # + # Use internal dependency generator rather than external helpers? diff --git a/rpm.spec b/rpm.spec index 6eb1f96..2790aab 100644 --- a/rpm.spec +++ b/rpm.spec @@ -34,7 +34,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.16.1.3 -Release: 4 +Release: 5 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -136,7 +136,7 @@ BuildRequires: tetex-pdftex Requires(posttrans): coreutils Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Requires: rpm-pld-macros >= 1.744 +Requires: rpm-pld-macros >= 2.002 Requires: FHS >= 3.0-2 Requires: libgcrypt Requires: popt >= %{popt_ver} -- 2.43.0