From 5474b012129d7d727d9fe742742b4a4b8e620993 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 7 Dec 2020 21:14:36 +0100 Subject: [PATCH] - PLD merge, set build-id links to alldebug --- build-id-links.patch | 12 ++++++++++++ default-patch-flags.patch | 12 ++++++++++++ rpm.spec | 6 +++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 build-id-links.patch create mode 100644 default-patch-flags.patch diff --git a/build-id-links.patch b/build-id-links.patch new file mode 100644 index 0000000..09afc1c --- /dev/null +++ b/build-id-links.patch @@ -0,0 +1,12 @@ +diff -ur rpm-4.16.0.orig/macros.in rpm-4.16.0/macros.in +--- rpm-4.16.0.orig/macros.in 2020-09-30 09:48:01.000000000 +0200 ++++ rpm-4.16.0/macros.in 2020-12-07 19:05:51.824516320 +0100 +@@ -531,7 +531,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 diff --git a/default-patch-flags.patch b/default-patch-flags.patch new file mode 100644 index 0000000..df4b8a8 --- /dev/null +++ b/default-patch-flags.patch @@ -0,0 +1,12 @@ +--- rpm-4.16.0/macros.in~ 2020-11-22 20:06:30.000000000 +0100 ++++ rpm-4.16.0/macros.in 2020-12-04 23:07:19.298019290 +0100 +@@ -419,8 +419,7 @@ + %_default_patch_fuzz 0 + + # Default patch flags +-#%_default_patch_flags -s +-%_default_patch_flags --no-backup-if-mismatch ++%_default_patch_flags -s + + #============================================================================== + # ---- Build configuration macros. diff --git a/rpm.spec b/rpm.spec index 59da342..6a5da8f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -26,7 +26,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.16.0 -Release: 0.9 +Release: 0.10 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -76,6 +76,8 @@ Patch24: cpuinfo-deps.patch Patch25: rpmio-read-proc-files.patch Patch26: allow-at-in-ver-rel.patch Patch27: no-exeonly-for-elf-reqprov.patch +Patch28: default-patch-flags.patch +Patch100: build-id-links.patch URL: https://rpm.org/ BuildRequires: acl-devel BuildRequires: db-devel >= %{db_ver} @@ -569,6 +571,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 +%patch100 -p1 install %{SOURCE15} scripts/perl.prov.in -- 2.44.0