Fix queries with src.rpm with DynamicBuildRequires
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
798b574046
commit
2a0a01ad36
@ -0,0 +1,30 @@
|
||||
From 69439fe4eea683200aa6449ac6632f4283997e49 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Schroeder <mls@suse.de>
|
||||
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
|
||||
|
@ -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 <ignatenkobrain@fedoraproject.org> - 0.7.5-3
|
||||
- Fix queries with src.rpm with DynamicBuildRequires
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user