From 358bccd1d9b94fbfccfabccc79eb18d5f265c75c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 21 Sep 2012 14:09:42 +0200 Subject: [PATCH] - make 'rpm -q --file ' always say something --- rpm-query-file-always-noisy.patch | 11 +++++++++++ rpm.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 rpm-query-file-always-noisy.patch diff --git a/rpm-query-file-always-noisy.patch b/rpm-query-file-always-noisy.patch new file mode 100644 index 0000000..7927607 --- /dev/null +++ b/rpm-query-file-always-noisy.patch @@ -0,0 +1,11 @@ +--- rpm-5.4.10/lib/query.c~ 2012-05-08 02:06:44.000000000 +0200 ++++ rpm-5.4.10/lib/query.c 2012-09-21 13:42:12.013607913 +0200 +@@ -732,7 +732,7 @@ + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEPATHS, fn, 0); + if (qva->qva_mi == NULL && !provides_checked && !gotpattern) { + qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, fn, 0); +-#if defined(RPM_VENDOR_MANDRIVA) ++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) + if(rpmmiCount(qva->qva_mi) == 0) + qva->qva_mi = rpmmiFree(qva->qva_mi); + #endif diff --git a/rpm.spec b/rpm.spec index 2a5d356..578455f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -43,7 +43,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.10 -Release: 0.23 +Release: 0.24 License: LGPL Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm @@ -126,6 +126,7 @@ Patch43: %{name}-fix-___build_pre-macro.patch Patch44: %{name}-missing-patch-file-fails-build.patch Patch45: %{name}-remove-misleading-missing-patch-message.patch Patch46: %{name}-file-magic-can-be-mixed-case.patch +Patch47: %{name}-query-file-always-noisy.patch # Patches imported from Mandriva @@ -795,6 +796,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch44 -p1 %patch45 -p1 %patch46 -p1 +%patch47 -p1 %patch1000 -p1 %patch1001 -p1 -- 2.44.0