[tigervnc/f21: 5/5] Merge branch 'f20' into f21

[Tim Waugh]

commit cb49f7a1d746c22f37dc5775acbd2c32bbe5dc78
Merge: d1c6b07 574f277
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jul 15 15:41:16 2014 +0100

    Merge branch 'f20' into f21

 tigervnc-ext-init.patch     |   20 ------
 tigervnc-undo-fc23895.patch |   48 --------------
 tigervnc.spec               |    2 +-
 tigervnc11-xorg113.patch    |  145 -------------------------------------------
 4 files changed, 1 insertions(+), 214 deletions(-)
---
diff --cc tigervnc.spec
index fdedb10,e24e9df..af2d063
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@@ -195,16 -187,17 +195,16 @@@ pop
  # Fixed viewer crash when cursor has not been set (bug #1038701).
  %patch13 -p1 -b .cursor
  
 -# Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
 -%patch14 -p1 -b .CVE-2014-0011
 +# Clearer xstartup file (bug #923655).
 +%patch14 -p1 -b .xstartup
 +
 +%patch15 -p1 -b .116
  
  # Input reset fixes from upstream (bug #1116956).
- %patch16 -p1 -b .input-reset
 -%patch15 -p1 -b .inputreset
++%patch16 -p1 -b .inputreset
  
  # Keep pointer in sync when using module (upstream bug #152).
 -%patch16 -p1 -b .pointersync
 -
 -# Clearer xstartup file (bug #923655).
 -%patch17 -p1 -b .xstartup
 +%patch17 -p1 -b .pointersync
  
  %build
  %ifarch sparcv9 sparc64 s390 s390x