From 2a0a01ad3617be3daff97667822a64dcef673aca Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 4 Aug 2019 11:09:01 +0200 Subject: [PATCH] Fix queries with src.rpm with DynamicBuildRequires Signed-off-by: Igor Gnatenko --- ...heck-for-src-rpms-even-if-there-are-.patch | 30 +++++++++++++++++++ libsolv.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Always-do-nevr-check-for-src-rpms-even-if-there-are-.patch diff --git a/0001-Always-do-nevr-check-for-src-rpms-even-if-there-are-.patch b/0001-Always-do-nevr-check-for-src-rpms-even-if-there-are-.patch new file mode 100644 index 0000000..1efec36 --- /dev/null +++ b/0001-Always-do-nevr-check-for-src-rpms-even-if-there-are-.patch @@ -0,0 +1,30 @@ +From 69439fe4eea683200aa6449ac6632f4283997e49 Mon Sep 17 00:00:00 2001 +From: Michael Schroeder +Date: Mon, 1 Jul 2019 14:52:24 +0200 +Subject: [PATCH] Always do nevr check for src rpms, even if there are provides + +Newer rpm versions add a "rpmlib(DynamicBuildRequires)" provides +to source rpms in some cases. Sigh. +--- + src/pool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pool.c b/src/pool.c +index a5544531..5651f85a 100644 +--- a/src/pool.c ++++ b/src/pool.c +@@ -1355,9 +1355,9 @@ pool_addrelproviders(Pool *pool, Id d) + continue; + } + } +- if (!s->provides) ++ if (!s->provides || s->arch == ARCH_SRC || s->arch == ARCH_NOSRC) + { +- /* no provides - check nevr */ ++ /* no provides or src rpm - check nevr */ + if (pool_match_nevr_rel(pool, s, MAKERELDEP(d))) + queue_push(&plist, p); + continue; +-- +2.22.0 + diff --git a/libsolv.spec b/libsolv.spec index 9b20461..02c4f38 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -21,13 +21,16 @@ Name: lib%{libname} Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package dependency solver License: BSD URL: https://github.com/openSUSE/libsolv Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/openSUSE/libsolv/commit/69439fe4eea683200aa6449ac6632f4283997e49 +Patch0001: 0001-Always-do-nevr-check-for-src-rpms-even-if-there-are-.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -276,6 +279,9 @@ Python 3 version. %endif %changelog +* Sun Aug 04 11:07:46 CEST 2019 Igor Gnatenko - 0.7.5-3 +- Fix queries with src.rpm with DynamicBuildRequires + * Thu Jul 25 2019 Fedora Release Engineering - 0.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild