From dd8687c2dae5e70c55ee5311aaedae7a57d45b8a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 28 2018 07:54:33 +0000 Subject: import libdnf-0.11.1-4.el7_6 --- diff --git a/SOURCES/0001-Use-arch-from-spec-in-hy_subject_get_best_selector-RhBug1542307.patch b/SOURCES/0001-Use-arch-from-spec-in-hy_subject_get_best_selector-RhBug1542307.patch new file mode 100644 index 0000000..43ba1d7 --- /dev/null +++ b/SOURCES/0001-Use-arch-from-spec-in-hy_subject_get_best_selector-RhBug1542307.patch @@ -0,0 +1,26 @@ +From 04cb64836deabf398ccdbf671be9a83837309c57 Mon Sep 17 00:00:00 2001 +From: Jaroslav Mracek +Date: Tue, 2 Oct 2018 16:59:32 +0200 +Subject: [PATCH] Use arch from spec in hy_subject_get_best_selector (RhBug:1542307) + +--- + libdnf/hy-subject.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libdnf/hy-subject.c b/libdnf/hy-subject.c +index 488ee6a..b72f4b5 100644 +--- a/libdnf/hy-subject.c ++++ b/libdnf/hy-subject.c +@@ -382,6 +382,9 @@ nevra_to_selector(HyNevra nevra, DnfSack *sack) + hy_selector_set(selector, HY_PKG_EVR, HY_EQ, evrbuf->str); + } + } ++ const char * arch = hy_nevra_get_string(nevra, HY_NEVRA_ARCH); ++ if (arch) ++ hy_selector_set(selector, HY_PKG_ARCH, HY_EQ, arch); + } + + if (hy_selector_has_matches(selector)) { +-- +libgit2 0.26.7 + diff --git a/SPECS/libdnf.spec b/SPECS/libdnf.spec index 4818ec6..83e90ce 100644 --- a/SPECS/libdnf.spec +++ b/SPECS/libdnf.spec @@ -22,11 +22,12 @@ Name: libdnf Version: 0.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library providing simplified C and Python API to libsolv License: LGPLv2+ URL: https://github.com/rpm-software-management/libdnf Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0001: 0001-Use-arch-from-spec-in-hy_subject_get_best_selector-RhBug1542307.patch BuildRequires: cmake BuildRequires: gcc @@ -92,7 +93,7 @@ Python 3 bindings for the hawkey library. %endif %prep -%autosetup +%autosetup -p1 mkdir build-py2 %if %{with python3} mkdir build-py3 @@ -165,6 +166,9 @@ popd %endif %changelog +* Thu Nov 08 2018 Jaroslav Mracek - 0.11.1-4 +- Backport patch for RHBZ#1542307 from upstream libdnf-0.11.1 + * Tue Nov 07 2017 Igor Gnatenko - 0.11.1-3 - Use better Obsoletes for platform-python