[X2Go-Commits] [nx-libs] 04/04: nx-libs.spec: newer versions of SLE* and OpenSuSE use xkbcomp-devel, while RedHat-based distros want xorg-x11-xkb-utils-devel for xkbcomp.pc.

git-admin at x2go.org git-admin at x2go.org
Sat Nov 10 07:33:46 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 93c9b8862e68a5be51852dbaaf8d2e005c0b2b54
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 10 07:30:23 2018 +0100

    nx-libs.spec: newer versions of SLE* and OpenSuSE use xkbcomp-devel, while RedHat-based distros want xorg-x11-xkb-utils-devel for xkbcomp.pc.
---
 nx-libs.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nx-libs.spec b/nx-libs.spec
index 396ff23..3066219 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -32,10 +32,17 @@ BuildRequires:  pkgconfig
 %if 0%{?suse_version} && 0%{?suse_version} < 1210
 BuildRequires:  xorg-x11-util-devel
 %else
-# we need xkbcomp.pc
-BuildRequires:  xorg-x11-xkb-utils-devel
 BuildRequires:  imake
 %endif
+# For xkbcomp.pc.
+%if 0%{?suse_version}
+# Earlier versions don't have xkbcomp.pc at all.
+%if 0%{?suse_version} >= 1210
+BuildRequires:  xkbcomp-devel
+%endif
+%else
+BuildRequires:  xorg-x11-xkb-utils-devel
+%endif
 
 # ideally we build with quilt (for mesa-quilt patch appliance script),
 # it seems Fedora has it...

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list