From 7d15b289b4b200d40e9103d8589e71d92cbe76b9 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jun 22 2020 02:35:08 +0000 Subject: Fix installtion path for fonts directory (#1849429) More conversion to pkgconf format --- diff --git a/blender.spec b/blender.spec index bf9c18f..c470f74 100644 --- a/blender.spec +++ b/blender.spec @@ -41,14 +41,17 @@ BuildRequires: gettext BuildRequires: git BuildRequires: libtool BuildRequires: libspnav-devel -#BuildRequires: meson BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(jemalloc) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(openssl) +%if 0%{?fedora} > 31 BuildRequires: pkgconfig(pugixml) +%else +BuildRequires: pugixml-devel +%endif BuildRequires: pkgconfig(python3) >= 3.5 BuildRequires: pkgconfig(xxf86vm) BuildRequires: python3-numpy @@ -57,9 +60,17 @@ BuildRequires: subversion-devel # Compression stuff BuildRequires: pkgconfig(liblzma) +%if 0%{?fedora} > 31 BuildRequires: pkgconfig(lzo2) +%else +BuildRequires: lzo-devel +%endif BuildRequires: pkgconfig(zlib) + + + + # 3D modeling stuff %ifarch x86_64 BuildRequires: embree-devel @@ -269,6 +280,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %changelog * Sun Jun 21 2020 Luya Tshimbalanga - 1:2.83.0-3 - Fix installtion path for fonts directory (#1849429) +- More conversion to pkgconf format * Sat Jun 20 2020 Luya Tshimbalanga - 1:2.83.0-2 - Remove undocumented and undefined function on Python 3.9