[tigervnc/f20: 4/4] Merge branch 'f19' into f20

[Tim Waugh]

commit 574f27776f3168d4240fe9c49a464e51e98e1066
Merge: 4cc2b0e 2122831
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jul 15 13:33:15 2014 +0100

    Merge branch 'f19' into f20

 tigervnc-ext-init.patch     |   20 ------
 tigervnc-undo-fc23895.patch |   48 --------------
 tigervnc.spec               |   12 +++-
 tigervnc11-xorg113.patch    |  145 -------------------------------------------
 4 files changed, 10 insertions(+), 215 deletions(-)
---
diff --cc tigervnc.spec
index 23cb62f,67e5703..e24e9df
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		tigervnc
  Version:	1.3.0
- Release:	16%{?dist}
 -Release:	13%{?dist}
++Release:	17%{?dist}
  Summary:	A TigerVNC remote display system
  
  Group:		User Interface/Desktops
@@@ -367,33 -360,27 +371,37 @@@ f
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
 -* Tue Jul 15 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-13
++* Tue Jul 15 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-17
+ - Actually apply patch for this earlier fix:
+   - Clearer xstartup file (bug #923655).
+ 
 -* Mon Jul 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-12
 +* Mon Jul 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-16
  - Input reset fixes from upstream (bug #1116956).
  
 -* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-11
 +* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-15
  - Keep pointer in sync when using module (upstream bug #152).
  
 -* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-10
 +* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-14
  - Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
  
 -* Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-9
 +* Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-13
  - Clearer xstartup file (bug #923655).
  
 -* Tue Jan 21 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-8
 +* Tue Jan 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-12
  - Fixed instructions in systemd unit file.
 +
 +* Fri Jan 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-11
  - Fixed viewer crash when cursor has not been set (bug #1038701).
 +
 +* Thu Dec 12 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-10
  - Avoid invalid read when ZRLE connection closed (upstream bug #133).
  
 +* Tue Dec  3 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-9
 +- Fixed build failure with -Werror=format-security (bug #1037358).
 +
 +* Thu Nov 07 2013 Adam Jackson <ajax at redhat.com> 1.3.0-8
 +- Rebuild against xserver 1.15RC1
 +
  * Tue Sep 24 2013 Tim Waugh <twaugh at redhat.com> 1.3.0-7
  - Removed incorrect patch (for unexpected key_is_down). Fixes stuck
    keys bug (bug #989502).