From b2779cce2c0ddb5c2b9af95a81af19bb218bab64e8cb09a80783e94b27164205 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 5 Aug 2019 12:52:20 +0000 Subject: [PATCH] - Add missing -gnu ABI suffix to platform names in pkgconf-pkg-config (boo#1144318) OBS-URL: https://build.opensuse.org/package/show/devel:tools/pkgconf?expand=0&rev=13 --- pkgconf.changes | 5 +++++ pkgconf.spec | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgconf.changes b/pkgconf.changes index c7b5af1..0de5808 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 5 12:46:49 UTC 2019 - Neal Gompa + +- Add missing -gnu ABI suffix to platform names in pkgconf-pkg-config (boo#1144318) + ------------------------------------------------------------------- Mon Jul 15 00:28:33 UTC 2019 - Neal Gompa diff --git a/pkgconf.spec b/pkgconf.spec index 034f044..2e0abc4 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -34,6 +34,9 @@ %global pkgconfig_obsver %{pkgconfig_ver}+1 %endif +# pkgconfig platform +%global pkgconf_target_platform %{_target_platform}%{?_gnu} + # Search path for pc files for pkgconf %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig @@ -162,13 +165,13 @@ EOM rm -rf %{buildroot}%{_datadir}/doc/%{name} %if %{with pkgconfig_compat} -install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config +install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config -sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ +sed -e "s|@TARGET_PLATFORM@|%{pkgconf_target_platform}|" \ -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ - -i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config + -i %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config @@ -218,7 +221,7 @@ rm -rf %{buildroot}%{_mandir}/man7 %files pkg-config %{_bindir}/pkg-config -%{_bindir}/%{_target_platform}-pkg-config +%{_bindir}/%{pkgconf_target_platform}-pkg-config %{_mandir}/man1/pkg-config.1* %dir %{_libdir}/pkgconfig %dir %{_datadir}/pkgconfig