diff --git a/freetype-2.8-multilib.patch b/freetype-2.8-multilib.patch index 706f583..3ffd146 100644 --- a/freetype-2.8-multilib.patch +++ b/freetype-2.8-multilib.patch @@ -48,17 +48,17 @@ + export PKG_CONFIG_SYSROOT_DIR fi -+prefix=`%PKG_CONFIG% --variable prefix freetype2` -+exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2` ++prefix=`pkgconf --variable prefix freetype2` ++exec_prefix=`pkgconf --variable exec_prefix freetype2` + -+includedir=`%PKG_CONFIG% --variable includedir freetype2` -+libdir=`%PKG_CONFIG% --variable libdir freetype2` ++includedir=`pkgconf --variable includedir freetype2` ++libdir=`pkgconf --variable libdir freetype2` + -+version=`%PKG_CONFIG% --modversion freetype2` ++version=`pkgconf --modversion freetype2` + -+cflags=`%PKG_CONFIG% --cflags freetype2` -+dynamic_libs=`%PKG_CONFIG% --libs freetype2` -+static_libs=`%PKG_CONFIG% --static --libs freetype2` ++cflags=`pkgconf --cflags freetype2` ++dynamic_libs=`pkgconf --libs freetype2` ++static_libs=`pkgconf --static --libs freetype2` + orig_prefix=$prefix orig_exec_prefix=$exec_prefix diff --git a/freetype.spec b/freetype.spec index 75d90e8..40e789f 100644 --- a/freetype.spec +++ b/freetype.spec @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries URL: http://www.freetype.org @@ -203,6 +203,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Oct 19 2018 Marek Kasik - 2.9.1-3 +- Use 'pkgconf' directly for multilib reasons +- Resolves: #1639379 + * Fri Jul 13 2018 Fedora Release Engineering - 2.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild