Merge branch 'master' of git://git.pld-linux.org/packages/tigervnc

diff --cc tigervnc.spec
index 0104689c02eb7a97804addb55a542dd4858bac4e,cd9c64bc3f03f95fbe737d10b2e7ccc068553661..af0e08e5db6805d89afd30127074b9bdb7f6b49a
--- 1/tigervnc.spec
--- 2/tigervnc.spec
+++ b/tigervnc.spec
@@@ -280,19 -281,9 +282,19 @@@ rm -rf $RPM_BUILD_ROO
  [ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
  %update_icon_cache hicolor
  
 +%post server
 +/sbin/chkconfig --add vncserver
 +%service vncserver restart "VNC server"
 +
 +%preun server
 +if [ "$1" = "0" ]; then
 +      %service vncserver stop
 +      /sbin/chkconfig --del vncserver
 +fi
 +
  %files -f %{name}.lang
  %defattr(644,root,root,755)
- %doc doc/*
+ %doc README.txt doc/*
  %attr(755,root,root) %{_bindir}/vncviewer
  %{_mandir}/man1/vncviewer.1*
  %{_desktopdir}/tigervnc.desktop