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

- do not include vnc Xserver module and xorg.conf snippet on s390x

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=12
This commit is contained in:
Stefan Dirsch 2014-01-10 15:13:33 +00:00 committed by Git OBS Bridge
parent 52ffc6dda5
commit e5ed90892e
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tigervnc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 10 15:11:50 UTC 2014 - sndirsch@suse.com
- do not include vnc Xserver module and xorg.conf snippet on s390x
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 9 11:40:13 UTC 2014 - msrb@suse.com Thu Jan 9 11:40:13 UTC 2014 - msrb@suse.com

12
tigervnc.spec
View File

@ -186,7 +186,9 @@ install -m644 com/tigervnc/vncviewer/index.vnc $RPM_BUILD_ROOT%{_datadir}/vnc/cl
popd popd
install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc
%ifnarch s390x
install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf
%endif
install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-server install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-server
install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd
@ -221,14 +223,24 @@ install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg
%exclude /usr/%{_lib}/xorg/protocol.txt %exclude /usr/%{_lib}/xorg/protocol.txt
%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
%ifnarch s390x
%{_libdir}/xorg/modules/extensions/libvnc.so %{_libdir}/xorg/modules/extensions/libvnc.so
%else
%exclude %{_libdir}/xorg/modules
%exclude %{_libdir}/xorg/modules/extensions
%exclude %{_libdir}/xorg/modules/extensions/libvnc.so
%endif
%exclude /var/lib/xkb/compiled/README.compiled %exclude /var/lib/xkb/compiled/README.compiled
/etc/sysconfig/SuSEfirewall2.d/services/vnc-server /etc/sysconfig/SuSEfirewall2.d/services/vnc-server
/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd /etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%ifnarch s390x
%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
%else
%exclude /etc/X11/xorg.conf.d
%endif
%config(noreplace) /etc/xinetd.d/vnc %config(noreplace) /etc/xinetd.d/vnc
%dir /etc/slp.reg.d %dir /etc/slp.reg.d
%config(noreplace) /etc/slp.reg.d/vnc.reg %config(noreplace) /etc/slp.reg.d/vnc.reg