From 39013eb03a0752ce57f9897de8ca0f49b8f374a2 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 27 May 2010 12:21:55 +0000 Subject: [PATCH] - adjust to new pkg-config behavior wrt private dependencies (#596433) --- redhat-rpm-config-9.1.0-pkgconfig-private.patch | 11 +++++++++++ redhat-rpm-config.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 redhat-rpm-config-9.1.0-pkgconfig-private.patch diff --git a/redhat-rpm-config-9.1.0-pkgconfig-private.patch b/redhat-rpm-config-9.1.0-pkgconfig-private.patch new file mode 100644 index 0000000..c467d89 --- /dev/null +++ b/redhat-rpm-config-9.1.0-pkgconfig-private.patch @@ -0,0 +1,11 @@ +--- redhat-rpm-config-9.1.0/find-requires.pkgconfig 2010-05-26 19:38:28.892598734 -0400 ++++ redhat-rpm-config-9.1.0/find-requires.pkgconfig.new-pkgconfig 2010-05-26 19:39:40.174602325 -0400 +@@ -4,7 +4,7 @@ test -x $pkgconfig || exit 0 + while read filename ; do + case "${filename}" in + *.pc) +- $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do ++ $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do + echo "pkgconfig($n)" "$r" "$v" + done + esac diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index f67cca6..6f705ab 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 4%{?dist} +Release: 5%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -10,6 +10,7 @@ Source: redhat-rpm-config-%{version}.tar.bz2 Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch Patch1: redhat-rpm-config-9.1.0-fix-requires.patch Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch +Patch3: redhat-rpm-config-9.1.0-pkgconfig-private.patch BuildArch: noarch Requires: mktemp Requires: rpm >= 4.6.0 @@ -24,6 +25,7 @@ Red Hat specific rpm configuration files. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -43,6 +45,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Thu May 27 2010 Panu Matilainen - 9.1.0-5 +- adjust to new pkg-config behavior wrt private dependencies (#596433) + * Mon Mar 01 2010 Panu Matilainen - 9.1.0-4 - avoid unnecessarily running brp-strip-comment-note (#568924)