aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2017-04-18 17:21:53 +0000
committerMihai Moldovan <ïonic@ionic.de>2017-04-18 19:07:27 +0000
commitadb2f80cc1ccd1066949ca851d8c963ff61bf1d1 (patch)
tree4b9d0a3ef859abca30355fe9db15bff59262362a
parent7c0a35916e9532277344edd3269a9667bcad52a8 (diff)
downloadnx-libs-adb2f80cc1ccd1066949ca851d8c963ff61bf1d1.tar.gz
nx-libs-adb2f80cc1ccd1066949ca851d8c963ff61bf1d1.tar.bz2
nx-libs-adb2f80cc1ccd1066949ca851d8c963ff61bf1d1.zip
{debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM and DEB packages.
-rw-r--r--debian/control2
-rw-r--r--nx-libs.spec14
2 files changed, 16 insertions, 0 deletions
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