diff --git a/.gitignore b/.gitignore index 8edb689..8db2aff 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /pkgconf-1.6.3.tar.xz /pkgconf-1.7.0.tar.xz /pkgconf-1.7.3.tar.xz +/pkgconf-1.7.4.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index f5c77cd..265068a 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,8 +23,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.7.3 -Release: 7%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -151,8 +151,6 @@ install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-confi sed -e "s|@TARGET_PLATFORM@|%{_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}|" \ @@ -213,6 +211,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Apr 28 2021 Neal Gompa - 1.7.4-1 +- Update to 1.7.4 +- Don't add /usr/local to syspaths (#1953348) + * Mon Feb 22 2021 Tomas Popela - 1.7.3-7 - Conditionalize the unit tests, disable them on RHEL 9 diff --git a/platform-pkg-config.in b/platform-pkg-config.in index 51c37d3..e5148e7 100644 --- a/platform-pkg-config.in +++ b/platform-pkg-config.in @@ -5,12 +5,10 @@ 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 +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@}" exec pkgconf "$@" diff --git a/sources b/sources index 387d1f1..8290651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.7.3.tar.xz) = 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 +SHA512 (pkgconf-1.7.4.tar.xz) = 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1