[tigervnc] Update to r4237.

[Adam Tkac]

commit b9c453b224fee90d2867022bfa7bcc2bc1386a31
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Jan 17 12:11:40 2011 +0100

    Update to r4237.
    
    - patches merged
      - tigervnc11-optionsdialog.patch
      - tigervnc11-rh607866.patch
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                     |    1 +
 sources                        |    2 +-
 tigervnc.spec                  |   16 ++--
 tigervnc11-optionsdialog.patch |   13 ----
 tigervnc11-rh607866.patch      |  156 ----------------------------------------
 5 files changed, 10 insertions(+), 178 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d828d0a..1b1d742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 tigervnc-1.0.90-20100721svn4113.tar.bz2
 /tigervnc-1.0.90-20100813svn4123.tar.bz2
 /tigervnc-1.0.90-20101208svn4225.tar.bz2
+/tigervnc-1.0.90-20110117svn4237.tar.bz2
diff --git a/sources b/sources
index ea6ea25..e84b49b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e30858eb41d040696b95901b3de45349  tigervnc-1.0.90-20101208svn4225.tar.bz2
+435627c00fc0cd7c6cf3596a3b139e27  tigervnc-1.0.90-20110117svn4237.tar.bz2
diff --git a/tigervnc.spec b/tigervnc.spec
index d999b1b..5455705 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,8 +1,8 @@
-%define snap 20101208svn4225
+%define snap 20110117svn4237
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.29.%{snap}%{?dist}
+Release:	0.30.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -43,8 +43,6 @@ Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
 Patch10:	tigervnc11-ldnow.patch
-Patch11:	tigervnc11-optionsdialog.patch
-Patch12:	tigervnc11-rh607866.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -130,10 +128,6 @@ This package contains license of the TigerVNC suite
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
 %patch10 -p1 -b .ldnow
-pushd unix/vncviewer
-%patch11 -p0 -b .optionsdialog
-popd
-%patch12 -p1 -b .rh607866
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
@@ -303,6 +297,12 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Mon Jan 17 2011 Adam Tkac <atkac redhat com> 1.0.90-0.30.20110117svn4237
+- update to r4237
+- patches merged
+  - tigervnc11-optionsdialog.patch
+  - tigervnc11-rh607866.patch
+
 * Fri Jan 14 2011 Adam Tkac <atkac redhat com> 1.0.90-0.29.20101208svn4225
 - improve patch for keyboard issues