aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-07-17 18:13:00 +0200
committerMihai Moldovan <ionic@ionic.de>2015-07-17 19:46:50 +0200
commitedeb4e196d3ac084a1429b27b6ef87403073ee8c (patch)
treeef29ab5aa5d289c407a970dffc46b1e2ddec5385
parent813d0cf137aa34d159342de5c6c3055c8d1fc984 (diff)
downloadnx-libs-edeb4e196d3ac084a1429b27b6ef87403073ee8c.tar.gz
nx-libs-edeb4e196d3ac084a1429b27b6ef87403073ee8c.tar.bz2
nx-libs-edeb4e196d3ac084a1429b27b6ef87403073ee8c.zip
nx-libs.spec: add xkeyboard-config to nxagent's Requires.
Should be a weak dependency, but RPM doesn't support that too well yet. Cherry-picked from 3.5.0.x branch.
-rw-r--r--debian/changelog3
-rw-r--r--nx-libs.spec4
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2be4d2d22..0a48e8635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
[ Mihai Moldovan ]
* debian/control:
- Add xkb-data to nxagent's Recommends.
+ * nx-libs.spec:
+ - Add xkeyboard-config to nxagent's Requires. Should be a weak dependency,
+ but RPM doesn't support that too well yet.
-- X2Go Release Manager <git-admin@x2go.org> Sat, 04 Jul 2015 06:29:19 +0200
diff --git a/nx-libs.spec b/nx-libs.spec
index f3bda3f80..01d5d9464 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -491,6 +491,10 @@ Provides: nx%{?_isa} = %{version}-%{release}
Requires: xorg-x11-fonts-core
%endif
+# Should be a weak dependency, because this package
+# works without the dependency.
+Requires: xkeyboard-config
+
%description -n nxagent
NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X