rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Accepting request 666671 from home:michalsrb:branches:X11:XOrg

Browse Source 
- Do not build xorg-x11-Xvnc-module on s390. It fails to build
  because macros.xorg-server is incomplete on s390 and the module
  would be useless without real X server anyway.

OBS-URL: https://build.opensuse.org/request/show/666671
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=153
This commit is contained in:
Michal Srb 2019-01-17 11:30:10 +00:00 committed by Git OBS Bridge
parent af196e6b2b
commit e058d2feb1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 17 10:21:29 UTC 2019 - msrb@suse.com
- Do not build xorg-x11-Xvnc-module on s390. It fails to build
because macros.xorg-server is incomplete on s390 and the module
would be useless without real X server anyway.
-------------------------------------------------------------------
Tue Jan 8 12:38:42 UTC 2019 - msrb@suse.com

18
tigervnc.spec
View File

@ -166,7 +166,9 @@ Requires: openssl(cli)
# For the with-vnc-key.sh script
Requires: /bin/hostname
%{?systemd_requires}
%ifnarch s390 s390x
Recommends: xorg-x11-Xvnc-module
%endif
Provides: tightvnc = 1.3.9
Provides: xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
Obsoletes: tightvnc < 1.3.9
@ -176,6 +178,7 @@ Group: System/X11/Servers/XF86_4
%description -n xorg-x11-Xvnc
This is the TigerVNC implementation of Xvnc.
%ifnarch s390 s390x
%package -n xorg-x11-Xvnc-module
Requires: xorg-x11-Xvnc
Summary: VNC module for X server
@ -186,6 +189,7 @@ Group: System/X11/Servers/XF86_4
This module allows to share content of X server's screen over VNC.
It is loaded into X server as a module if enable in X server's
configuration.
%endif
%package -n xorg-x11-Xvnc-novnc
Requires: novnc
@ -497,17 +501,19 @@ fi
%{_libexecdir}/vnc
%ifarch s390 s390x
# These would be in xorg-x11-Xvnc-module, but we don't build that on s390
%exclude /usr/%{_lib}/xorg/protocol.txt
%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.so
%endif
%ifnarch s390 s390x
%files -n xorg-x11-Xvnc-module
%exclude /usr/%{_lib}/xorg/protocol.txt
%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
%ifnarch s390 s390x
%{_libdir}/xorg/modules/extensions/libvnc.so
%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
%else
%exclude /etc/X11/xorg.conf.d
%exclude %{_libdir}/xorg/modules
%exclude %{_libdir}/xorg/modules/extensions
%exclude %{_libdir}/xorg/modules/extensions/libvnc.so
%endif
%files -n xorg-x11-Xvnc-novnc