Hello community, here is the log from the commit of package pkgconf for openSUSE:Factory checked in at 2020-08-17 11:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pkgconf (Old) and /work/SRC/openSUSE:Factory/.pkgconf.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pkgconf" Mon Aug 17 11:59:38 2020 rev:9 rq:825209 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pkgconf/pkgconf.changes 2020-06-21 19:53:34.966612035 +0200 +++ /work/SRC/openSUSE:Factory/.pkgconf.new.3399/pkgconf.changes 2020-08-17 11:59:49.414508462 +0200 @@ -1,0 +2,5 @@ +Mon Aug 10 05:03:07 UTC 2020 - Neal Gompa <[email protected]> + +- Add /usr/local paths to pkg-config(1) search path for non RPM builds (boo#1175039) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pkgconf.spec ++++++ --- /var/tmp/diff_new_pack.LzNQSq/_old 2020-08-17 11:59:52.826510363 +0200 +++ /var/tmp/diff_new_pack.LzNQSq/_new 2020-08-17 11:59:52.830510365 +0200 @@ -2,7 +2,7 @@ # spec file for package pkgconf # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2019 Neal Gompa <[email protected]>. +# Copyright (c) 2020 Neal Gompa <[email protected]>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -168,12 +168,15 @@ install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config sed -e "s|@TARGET_PLATFORM@|%{pkgconf_target_platform}|" \ + -e "s|@PKGCONF_LIBDIRS_LOCAL@|/usr/local/%{_lib}/pkgconfig:/usr/local/share/pkgconfig:%{pkgconf_libdirs}|" \ + -e "s|@PKGCONF_SYSLIBDIR_LOCAL@|/usr/local/%{_lib}:%{_libdir}|" \ + -e "s|@PKGCONF_SYSINCDIR_LOCAL@|/usr/local/include:%{_includedir}|" \ -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ -i %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config -ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config +ln -sr %{buildroot}%{_bindir}/%{pkgconf_target_platform}-pkg-config %{buildroot}%{_bindir}/pkg-config # Link pkg-config(1) to pkgconf(1) echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1 ++++++ platform-pkg-config.in ++++++ --- /var/tmp/diff_new_pack.LzNQSq/_old 2020-08-17 11:59:52.862510383 +0200 +++ /var/tmp/diff_new_pack.LzNQSq/_new 2020-08-17 11:59:52.862510383 +0200 @@ -3,8 +3,14 @@ # Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config # Platform: @TARGET_PLATFORM@ -export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" -export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" -export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" +if [ -z "${RPM_BUILD_ROOT}" ]; then + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS_LOCAL@}" + export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR_LOCAL@}" + export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR_LOCAL@}" +else + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" + export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" + export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" +fi exec pkgconf "$@"
