rpms/tigervnc/F-11 tigervnc10-rh501832.patch, NONE, 1.1 tigervnc.spec, 1.9, 1.10

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29908

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh501832.patch 
Log Message:
- rebuild against 1.6.1.901 X server (#497835)
- disable i18n, vncviewer is not UTF-8 compatible (#501832)


tigervnc10-rh501832.patch:

--- NEW FILE tigervnc10-rh501832.patch ---
diff -up tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832 tigervnc-0.0.90/unix/vncviewer/AboutDialog.h
--- tigervnc-0.0.90/unix/vncviewer/AboutDialog.h.rh501832	2009-05-21 14:16:20.173820756 +0200
+++ tigervnc-0.0.90/unix/vncviewer/AboutDialog.h	2009-05-21 14:16:39.129309405 +0200
@@ -26,6 +26,10 @@
 #include "parameters.h"
 
 #include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
 #define _(String) gettext (String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
diff -up tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832 tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx
--- tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx.rh501832	2009-05-21 14:15:51.810818893 +0200
+++ tigervnc-0.0.90/unix/vncviewer/vncviewer.cxx	2009-05-21 14:16:09.614303459 +0200
@@ -39,6 +39,10 @@
 #include "CConn.h"
 
 #include "gettext.h"
+
+/* Disable I18N - RH bug #501832 */
+#define gettext(arg) (arg)
+
 #define _(String) gettext (String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- tigervnc.spec	18 May 2009 14:01:09 -0000	1.9
+++ tigervnc.spec	21 May 2009 12:24:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.9%{?dist}
+Release:	0.10%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -41,6 +41,7 @@ Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
 Patch9:		tigervnc10-rh499401.patch
 Patch10:	tigervnc10-rh497592.patch
+Patch11:	tigervnc10-rh501832.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -91,7 +92,7 @@ pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 --fuzz=0 -b --suffix .vnc < ../xserver16.patch
+patch -p1 -b --suffix .vnc < ../xserver16.patch
 popd
 
 
@@ -101,6 +102,7 @@ popd
 %patch8 -p1 -b .viewer-reparent
 %patch9 -p0 -b .rh499401
 %patch10 -p1 -b .rh497592
+%patch11 -p1 -b .rh501832
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -240,6 +242,10 @@ fi
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Thu May 21 2009 Adam Tkac <atkac redhat com> 0.0.90-10
+- rebuild against 1.6.1.901 X server (#497835)
+- disable i18n, vncviewer is not UTF-8 compatible (#501832)
+
 * Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-9
 - fix vncpasswd crash on long passwords (#499401)
 - start session dbus daemon correctly (#497592)