From 836b38b59d94ef71f4c3fc47e167b099549e482d Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 27 Oct 2020 21:50:38 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pkgconf.git#5dea89a881102185fe291a7a4902a10caa5b9a5e
---
 pkg-config.in |  8 ++++++++
 pkgconf.spec  | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 pkg-config.in

diff --git a/pkg-config.in b/pkg-config.in
new file mode 100644
index 0000000..0d12767
--- /dev/null
+++ b/pkg-config.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config
+
+## Vendored definition of %_target_platform from redhat-rpm-config to avoid depending on it
+TARGET_PLATFORM=$(rpm --eval '%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}')
+
+exec "@PKGCONF_BINDIR@/${TARGET_PLATFORM}-pkg-config" "$@"
diff --git a/pkgconf.spec b/pkgconf.spec
index 5ce3e02..837848a 100644
--- a/pkgconf.spec
+++ b/pkgconf.spec
@@ -17,7 +17,7 @@
 
 Name:           pkgconf
 Version:        1.7.3
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Package compiler and linker metadata toolkit
 
 License:        ISC
@@ -25,8 +25,9 @@ URL:            http://pkgconf.org/
 # Mirror at https://releases.pagure.org/pkgconf/pkgconf/
 Source0:        https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
 
-# Simple wrapper script to offer platform versions of pkgconfig
+# Simple wrapper scripts to offer platform versions of pkgconfig
 Source1:        platform-pkg-config.in
+Source2:        pkg-config.in
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -146,7 +147,10 @@ sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \
     -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \
     -i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
 
-ln -sr %{buildroot}%{_bindir}/%{_target_platform}-pkg-config %{buildroot}%{_bindir}/pkg-config
+install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/pkg-config
+
+sed -e "s|@PKGCONF_BINDIR@|%{_bindir}|" \
+    -i %{buildroot}%{_bindir}/pkg-config
 
 # Link pkg-config(1) to pkgconf(1)
 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1
@@ -198,6 +202,15 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %endif
 
 %changelog
+* Mon Oct 19 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-5
+- Use internal target platform definition for pkg-config wrapper
+
+* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-4
+- Fix pkg-config wrapper for armv7hl
+
+* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-3
+- Make /usr/bin/pkg-config multilib safe
+
 * Mon Aug 10 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-2
 - Add /usr/local paths to pkg-config(1) search path for non RPM builds