diff --git a/0002-Add-testcase-for-color-filtering-when-adding-update-.patch b/0002-Add-testcase-for-color-filtering-when-adding-update-.patch new file mode 100644 index 0000000..89470a4 --- /dev/null +++ b/0002-Add-testcase-for-color-filtering-when-adding-update-.patch @@ -0,0 +1,74 @@ +From 24a7a79595a1f7e35a4ac430d3075e27a9a1fc2f Mon Sep 17 00:00:00 2001 +From: Evan Goode +Date: Tue, 20 Jan 2026 14:11:40 -0500 +Subject: [PATCH] Add testcase for color filtering when adding update targets + +Related: https://github.com/openSUSE/libsolv/issues/583 +--- + ...est_multiarch_implicitobsoleteusescolors.t | 54 +++++++++++++++++++ + 1 file changed, 54 insertions(+) + create mode 100644 test/testcases/forcebest/forcebest_multiarch_implicitobsoleteusescolors.t + +diff --git a/test/testcases/forcebest/forcebest_multiarch_implicitobsoleteusescolors.t b/test/testcases/forcebest/forcebest_multiarch_implicitobsoleteusescolors.t +new file mode 100644 +index 00000000..97660e36 +--- /dev/null ++++ b/test/testcases/forcebest/forcebest_multiarch_implicitobsoleteusescolors.t +@@ -0,0 +1,54 @@ ++repo @System 0 testtags ++#>=Ver: 3.0 ++#>=Pkg: a 1 1 x86_64 ++#>=Prv: a = 1-1 ++#>=Con: c < 1-1 ++#> ++#>=Pkg: c 1 1 x86_64 ++#>=Req: c-dep = 1-1 ++#>=Prv: c = 1-1 ++#> ++#>=Pkg: c-dep 1 1 x86_64 ++#>=Prv: c-dep = 1-1 ++#> ++#>=Pkg: d 1 1 x86_64 ++#>=Req: c = 1-1 ++#>=Req: multiarch = 1-1 ++#>=Prv: d = 1-1 ++#> ++#>=Pkg: multiarch 1 1 x86_64 ++#>=Prv: multiarch = 1-1 ++ ++repo available 0 testtags ++#>=Ver: 3.0 ++#>=Pkg: a 2 2 x86_64 ++#>=Prv: a = 2-2 ++#>=Con: c < 2-2 ++#> ++#>=Pkg: c 2 2 x86_64 ++#>=Req: c-dep = 2-2 ++#>=Prv: c = 2-2 ++#> ++#>=Pkg: c-dep 2 2 x86_64 ++#>=Prv: c-dep = 2-2 ++#> ++#>=Pkg: d 2 2 x86_64 ++#>=Req: multiarch >= 2-2 ++#>=Prv: d = 2-2 ++#> ++#>=Pkg: multiarch 2 2 x86_64 ++#>=Prv: multiarch = 2-2 ++#> ++#>=Pkg: multiarch 2 2 i686 ++#>=Prv: multiarch = 2-2 ++ ++system x86_64 rpm @System ++poolflags implicitobsoleteusescolors ++solverflags bestobeypolicy ++job update oneof a-2-2.x86_64@available multiarch-1-1.x86_64@@System multiarch-2-2.i686@available [forcebest,targeted,setevr,setarch] ++result transaction,problems ++#>upgrade a-1-1.x86_64@@System a-2-2.x86_64@available ++#>upgrade multiarch-1-1.x86_64@@System multiarch-2-2.x86_64@available ++#>upgrade c-dep-1-1.x86_64@@System c-dep-2-2.x86_64@available ++#>upgrade c-1-1.x86_64@@System c-2-2.x86_64@available ++#>upgrade d-1-1.x86_64@@System d-2-2.x86_64@available +-- +2.52.0 + diff --git a/libsolv.spec b/libsolv.spec index 99f694d..3f7462f 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -52,10 +52,15 @@ License: BSD-3-Clause SourceLicense: %{license} AND BSD-2-Clause AND MIT URL: https://github.com/openSUSE/libsolv Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + # Downstream-only, RHEL-41048 # Submitted upstream https://github.com/openSUSE/libsolv/pull/598 Patch0: 0001-Add-support-for-computing-hashes-using-OpenSSL.patch +# Downstream-only, RHEL-86205 +# Submitted upstream https://github.com/openSUSE/libsolv/pull/604 +Patch1: 0002-Add-testcase-for-color-filtering-when-adding-update-.patch + # AlmaLinux Patch Patch1000: 0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch