diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-18 22:45:11 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-18 22:45:11 +0200 |
| commit | 85b58daa8ece8452daafb9de36723951b2376345 (patch) | |
| tree | 425b043560d2ceddd59b80b5cb310ee92e1b044b | |
| parent | cc17d89e22994b07f822ee13782ff654f4bb0daa (diff) | |
| parent | a2dca67a5f025122ae5d5c4965d4feaf8baf49e5 (diff) | |
| download | nx-libs-85b58daa8ece8452daafb9de36723951b2376345.tar.gz nx-libs-85b58daa8ece8452daafb9de36723951b2376345.tar.bz2 nx-libs-85b58daa8ece8452daafb9de36723951b2376345.zip | |
Merge branch 'Ionic-add-xkbcomp-dep' into 3.6.x
Attributes GH PR #434: https://github.com/ArcticaProject/nx-libs/pull/434
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | nx-libs.spec | 27 |
2 files changed, 22 insertions, 7 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 afafb3266..c90fc67cd 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -287,7 +287,21 @@ Provides: nx%{?_isa} = %{version}-%{release} Obsoletes: nxauth < 3.5.99.1 %if 0%{?fedora} || 0%{?rhel} # For /usr/share/X11/fonts -Requires: xorg-x11-font-utils +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 @@ -388,10 +402,6 @@ chmod 755 %{buildroot}%{_libdir}/lib*.so* rm -r %{buildroot}%{_includedir}/GL rm -r %{buildroot}%{_includedir}/nx-X11/extensions/XK*.h rm -r %{buildroot}%{_includedir}/nx-X11/extensions/*Xv*.h -rm -r %{buildroot}%{_includedir}/nx-X11/extensions/dpms.h -rm -r %{buildroot}%{_includedir}/nx-X11/extensions/security.h -rm -r %{buildroot}%{_includedir}/nx-X11/extensions/sync.h -rm -r %{buildroot}%{_includedir}/nx-X11/extensions/xtestext1.h rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %if 0%{?fdupes:1} @@ -471,7 +481,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %defattr(-,root,root) %dir %{_includedir}/nx-X11/extensions %{_includedir}/nx-X11/extensions/panoramiXext.h -%{_includedir}/nx-X11/extensions/record.h %{_includedir}/nx-X11/misc.h %{_includedir}/nx-X11/os.h @@ -509,17 +518,20 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_includedir}/nx-X11/extensions/compositeproto.h %{_includedir}/nx-X11/extensions/damagewire.h %{_includedir}/nx-X11/extensions/damageproto.h +%{_includedir}/nx-X11/extensions/dpms.h %{_includedir}/nx-X11/extensions/dpmsstr.h %{_includedir}/nx-X11/extensions/panoramiXproto.h %{_includedir}/nx-X11/extensions/randr.h %{_includedir}/nx-X11/extensions/randrproto.h -%{_includedir}/nx-X11/extensions/recordstr.h +%{_includedir}/nx-X11/extensions/record*.h %{_includedir}/nx-X11/extensions/render.h %{_includedir}/nx-X11/extensions/renderproto.h %{_includedir}/nx-X11/extensions/saver.h %{_includedir}/nx-X11/extensions/saverproto.h %{_includedir}/nx-X11/extensions/scrnsaver.h +%{_includedir}/nx-X11/extensions/security.h %{_includedir}/nx-X11/extensions/securstr.h +%{_includedir}/nx-X11/extensions/sync.h %{_includedir}/nx-X11/extensions/syncstr.h %{_includedir}/nx-X11/extensions/xcmiscstr.h %{_includedir}/nx-X11/extensions/xf86bigfont.h @@ -527,6 +539,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_includedir}/nx-X11/extensions/xfixesproto.h %{_includedir}/nx-X11/extensions/xfixeswire.h %{_includedir}/nx-X11/extensions/xtestconst.h +%{_includedir}/nx-X11/extensions/xtestext1.h %{_includedir}/nx-X11/extensions/xteststr.h %files -n nxagent |