From 73a84372e0ff8c45aeaed856353ce35c8cb48c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Tue, 17 Sep 2024 08:47:15 -0400 Subject: [PATCH] Add missing `Recommends` to simulate real debuginfo pkgs Since `rpm-4.19.94-1.fc42` the rpm debuginfo code logic is not always executed. To match real debuginfo pkgs add debugsource recommends manually. More details: https://github.com/rpm-software-management/rpm/issues/3310 --- dnf-behave-tests/fixtures/specs/debuginfo-install/bar-1.0.spec | 1 + dnf-behave-tests/fixtures/specs/debuginfo-install/bar-3.0.spec | 1 + .../fixtures/specs/debuginfo-install/baz-2.0.i686.spec | 1 + dnf-behave-tests/fixtures/specs/debuginfo-install/foo-1.0.spec | 1 + dnf-behave-tests/fixtures/specs/debuginfo-install/foo-2.0.spec | 1 + .../fixtures/specs/debuginfo-install/kernel-1.0.spec | 1 + .../fixtures/specs/debuginfo-install/kernel-2.0.spec | 1 + 7 files changed, 7 insertions(+) diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-1.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-1.0.spec index f04a28397..40dd3b801 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-1.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-1.0.spec @@ -16,6 +16,7 @@ Dummy. %package debuginfo Summary: Debug information for foo. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-3.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-3.0.spec index f8aaf6bd0..d3aca4c91 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-3.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/bar-3.0.spec @@ -16,6 +16,7 @@ Dummy. %package debuginfo Summary: Debug information for foo. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/baz-2.0.i686.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/baz-2.0.i686.spec index 5d836f973..5a3c1d7af 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/baz-2.0.i686.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/baz-2.0.i686.spec @@ -18,6 +18,7 @@ Dummy. %package debuginfo Summary: Debug information for foo. +Recommends: %{name}-debugsource(i686) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-1.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-1.0.spec index 348706ca9..7f92bfad3 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-1.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-1.0.spec @@ -24,6 +24,7 @@ Dummy. %package debuginfo Summary: Debug information for foo. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-2.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-2.0.spec index 5f8c0f5f7..903c27a41 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-2.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/foo-2.0.spec @@ -24,6 +24,7 @@ Dummy. %package debuginfo Summary: Debug information for foo. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-1.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-1.0.spec index c2aff17d0..78e5d2625 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-1.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-1.0.spec @@ -18,6 +18,7 @@ Dummy. %package debuginfo Summary: Debug information for kernel. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy. diff --git a/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-2.0.spec b/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-2.0.spec index 05317f5f9..6496f6c8b 100644 --- a/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-2.0.spec +++ b/dnf-behave-tests/fixtures/specs/debuginfo-install/kernel-2.0.spec @@ -18,6 +18,7 @@ Dummy. %package debuginfo Summary: Debug information for kernel. +Recommends: %{name}-debugsource(x86-64) = %{version}-%{release} %description debuginfo Dummy.