This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 0c9852a76ef405bc28b7e33d8cf14d0e5f49d352 Author: Mihai Moldovan <ïonic@ionic.de> Date: Tue Apr 18 17:21:53 2017 +0000 {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM and DEB packages. Backported from Arctica GH 3.6.x branch. v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) --- debian/changelog | 4 ++++ debian/control | 2 ++ nx-libs.spec | 14 ++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/debian/changelog b/debian/changelog index d3e2375..f99ac2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,10 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low * nx-X11: use the "old", non-NX header location. Affects: - 1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch + * {debian/control,nx-libs.spec}: + - Add proper dependencies upon xkbcomp for RPM and DEB packages. + Backported from Arctica GH 3.6.x branch. + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) [ Mike Gabriel ] * debian/libxinerama1.postinst.in: diff --git a/debian/control b/debian/control index aa444fe..5dcab77 100644 --- a/debian/control +++ b/debian/control @@ -1007,6 +1007,8 @@ Depends: # </Workaround> ${shlibs:Depends}, ${misc:Depends}, +# For /usr/bin/xkbcomp + x11-xkb-utils, Recommends: xfonts-base, xkb-data, diff --git a/nx-libs.spec b/nx-libs.spec index e0d5d8b..cc21a84 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -599,6 +599,20 @@ Requires: xorg-x11-fonts-core # works without the dependency. Requires: xkeyboard-config +# 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 -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git