From adb2f80cc1ccd1066949ca851d8c963ff61bf1d1 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ïonic@ionic.de>
Date: Tue, 18 Apr 2017 17:21:53 +0000
Subject: {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp
 for RPM and DEB packages.

---
 debian/control |  2 ++
 nx-libs.spec   | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/debian/control b/debian/control
index bcf557685..5ead9fb6b 100644
--- a/debian/control
+++ b/debian/control
@@ -338,6 +338,8 @@ Depends:
  libxcomp3 (= ${binary:Version}),
  libxcompshad3 (= ${binary:Version}),
  libnx-x11-6 (= ${binary:Version}),
+# For /usr/bin/xkbcomp
+ x11-xkb-utils,
 Recommends:
  xfonts-base,
  xkb-data,
diff --git a/nx-libs.spec b/nx-libs.spec
index 9c49d6728..80e0c49ac 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -290,6 +290,20 @@ Obsoletes:      nxauth < 3.5.99.1
 Requires:       xorg-x11-font-utils
 %endif
 
+# For /usr/bin/xkbcomp
+%if 0%{?fedora} || 0%{?rhel}
+Requires:       xorg-x11-xkb-utils
+%else
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1310
+Requires:       xkbcomp
+%else
+# Older *SUSE versions bundle xkbcomp in xorg-x11. Ugly, but nothing we could change.
+Requires:       xorg-x11
+%endif
+%endif
+%endif
+
 %description -n nxagent
 NX is a software suite which implements very efficient compression of
 the X11 protocol. This increases performance when using X
-- 
cgit v1.2.3