From 87b0fb5bffe697a22cfa41c11fc49703f5e3ff05 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 07 2022 22:17:30 +0000 Subject: import rpm-4.14.3-23.el8 --- diff --git a/SOURCES/rpm-4.14.3-add-path-query-option.patch b/SOURCES/rpm-4.14.3-add-path-query-option.patch index 51b37db..0504ec8 100644 --- a/SOURCES/rpm-4.14.3-add-path-query-option.patch +++ b/SOURCES/rpm-4.14.3-add-path-query-option.patch @@ -1,4 +1,4 @@ -From 5e26aa82fb1792c0441131db8dc87976d2d653bb Mon Sep 17 00:00:00 2001 +From 013cd4ba63c35fa75feeccde0022d56e68bc5845 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Mon, 16 Aug 2021 18:21:02 +0200 Subject: [PATCH] Add support for RPMDBI_BASENAMES on file queries @@ -14,8 +14,11 @@ Update the man page for --file to reflect it's current behavior and make Resolves: rhbz#1940895 -Combined with d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f and backported -for 4.14.3. +Combined with: +d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f +f62b6d27cd741406a52a7e9c5b1d6f581dbd3af8 + +Backported for 4.14.3. --- doc/rpm.8 | 9 ++++++-- lib/poptQV.c | 6 +++++- @@ -115,17 +118,17 @@ index 26cdecf10..e6ea1fa2d 100644 mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, fn, 0); diff --git a/lib/rpmcli.h b/lib/rpmcli.h -index 99af2585a..330fd956f 100644 +index 99af2585a..c0d07d137 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h -@@ -82,6 +82,7 @@ rpmcliFini(poptContext optCon); - enum rpmQVSources_e { - RPMQV_PACKAGE = 0, /*!< ... from package name db search. */ - RPMQV_PATH, /*!< ... from file path db search. */ +@@ -102,6 +102,7 @@ enum rpmQVSources_e { + RPMQV_SPECBUILTRPMS, /*!< ... from pkgs which would be built from spec */ + RPMQV_WHATOBSOLETES, /*!< ... from obsoletes db search. */ + RPMQV_WHATCONFLICTS, /*!< ... from conflicts db search. */ + RPMQV_PATH_ALL, /*!< ... from file path db search (all states). */ - RPMQV_ALL, /*!< ... from each installed package. */ - RPMQV_RPM, /*!< ... from reading binary rpm package. */ - RPMQV_GROUP, /*!< ... from group db search. */ + }; + + typedef rpmFlags rpmQVSources; diff --git a/tests/rpmquery.at b/tests/rpmquery.at index 36c62339a..ad580f664 100644 --- a/tests/rpmquery.at @@ -190,5 +193,5 @@ index 36c62339a..ad580f664 100644 AT_SETUP([integer array query]) AT_KEYWORDS([query]) -- -2.33.1 +2.35.1 diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index 7515542..d2e8994 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -32,7 +32,7 @@ %global rpmver 4.14.3 #global snapver rc2 -%global rel 22 +%global rel 23 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -694,6 +694,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Tue Apr 05 2022 Michal Domonkos - 4.14.3-23 +- Fix minor ABI regression in rpmcli.h (#1940895) + * Tue Feb 15 2022 Michal Domonkos - 4.14.3-22 - Fix spurious %transfiletriggerpostun execution (#2023693) - Skip recorded symlinks in --setperms (#1900662)