From c4c5485474a03bcfd2632d12c2e6e88ba20be471 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 10 Apr 2017 12:43:33 +0200 Subject: nx-libs.spec: Prefer libXfont2-devel on RPM distro versions that have it.~ --- nx-libs.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nx-libs.spec b/nx-libs.spec index 7e25b7e81..935219f0f 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -38,7 +38,11 @@ BuildRequires: pkgconfig(pixman-1) >= 0.13.2 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xpm) +#%%if 0%%{?suse_version} >= 42XX +#BuildRequires: pkgconfig(xfont2) +#%%else BuildRequires: pkgconfig(xfont) >= 1.4.2 +#%%endif BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xcomposite) @@ -74,7 +78,11 @@ BuildRequires: pixman-devel >= 0.13.2 BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXpm-devel +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 +BuildRequires: libXfont2-devel +%else BuildRequires: libXfont-devel >= 1.4.2 +%endif BuildRequires: libXdmcp-devel BuildRequires: libXdamage-devel BuildRequires: libXcomposite-devel -- cgit v1.2.3