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

[hawk]

commit b05eeac8c634fbf5443d4ca2881c44ff4c9534a6
Merge: 2dcb351 a5f2294
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Jul 21 18:54:04 2013 +0000

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

 tigervnc.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --cc tigervnc.spec
index 0104689,cd9c64b..af0e08e
--- a/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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tigervnc.git/commitdiff/b05eeac8c634fbf5443d4ca2881c44ff4c9534a6