pool/tigervnc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 818107 from X11:XOrg

Browse Source 
- moved vnc snippet to /usr/share/X11/xorg.conf.d (boo#1173045)
- package SLP sample config vnc.reg only as %doc (boo#1173045)
- moved vnc pam config to /etc/usr/pam.d (boo#1173045)

OBS-URL: https://build.opensuse.org/request/show/818107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2020-07-02 21:56:52 +00:00 committed by Git OBS Bridge
commit 76e8c99d34
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 1 10:19:18 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- moved vnc snippet to /usr/share/X11/xorg.conf.d (boo#1173045)
- package SLP sample config vnc.reg only as %doc (boo#1173045)
- moved vnc pam config to /etc/usr/pam.d (boo#1173045)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 13 18:20:43 UTC 2020 - Lorenzo Paulatto <paulatz@gmail.com> Mon Apr 13 18:20:43 UTC 2020 - Lorenzo Paulatto <paulatz@gmail.com>

24
tigervnc.spec
View File

@ -30,6 +30,10 @@
%define use_firewalld 0 %define use_firewalld 0
%endif %endif
%if 0%{?suse_version} < 1550
%define _distconfdir /etc
%endif
Name: tigervnc Name: tigervnc
Version: 1.10.1 Version: 1.10.1
Release: 0 Release: 0
@ -321,7 +325,7 @@ install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes
popd popd
%ifnarch s390x %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/usr/share/X11/xorg.conf.d/10-libvnc.conf
%endif %endif
%if %{use_firewalld} %if %{use_firewalld}
@ -332,9 +336,10 @@ install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewal
install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif %endif
install -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg # only package as %doc (boo#1173045)
cp %{SOURCE7} .
install -D -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg install -D -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg
install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/vnc install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_distconfdir}/pam.d/vnc
install -D -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/vnc/classes install -D -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer
@ -463,7 +468,7 @@ fi
%_datadir/applications/vncviewer.desktop %_datadir/applications/vncviewer.desktop
%files -n xorg-x11-Xvnc %files -n xorg-x11-Xvnc
%doc LICENCE.TXT README.rst %doc LICENCE.TXT README.rst vnc.reg
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/Xvnc %{_bindir}/Xvnc
@ -497,10 +502,11 @@ fi
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif %endif
%dir /etc/slp.reg.d %if 0%{?suse_version} < 1550
%config(noreplace) /etc/slp.reg.d/vnc.reg %config %{_distconfdir}/pam.d/vnc
%else
%config %{_sysconfdir}/pam.d/vnc %{_distconfdir}/pam.d/vnc
%endif
%dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc %dir %attr(0755,%{vncuser},%{vncuser}) %{_sysconfdir}/vnc
%ghost %attr(0600,%{vncuser},%{vncuser}) %config(noreplace) %{tlskey} %ghost %attr(0600,%{vncuser},%{vncuser}) %config(noreplace) %{tlskey}
@ -520,7 +526,7 @@ fi
%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
%{_libdir}/xorg/modules/extensions/libvnc.so %{_libdir}/xorg/modules/extensions/libvnc.so
%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf /usr/share/X11/xorg.conf.d/10-libvnc.conf
%endif %endif
%files -n xorg-x11-Xvnc-novnc %files -n xorg-x11-Xvnc-novnc