--- a/ChangeLog	Mon Feb 09 07:41:23 2009 +0000
+++ b/ChangeLog	Mon Feb 09 07:46:50 2009 +0000
@@ -1,3 +1,9 @@
+2009-02-09  Halton Huo  <[email protected]>
+
+	* base-specs/vino.spec: Bump to 2.25.90
+	* patches/vino-01-menu-entry.diff: rework
+	* patches/vino-03-typo.diff: remove upstreamed patch
+
 2009-02-09  Takao Fujiwara  <[email protected]>
 
 	* base-specs/gdm.spec: Updated.

--- a/base-specs/vino.spec	Mon Feb 09 07:41:23 2009 +0000
+++ b/base-specs/vino.spec	Mon Feb 09 07:46:50 2009 +0000
@@ -11,7 +11,7 @@
 Name:			vino
 License:		GPL v2
 Group:			System/GUI/GNOME
-Version:		2.25.5
+Version:		2.25.90
 Release:		2
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -25,8 +25,6 @@
 Patch1:                 %{name}-01-menu-entry.diff
 # date:2008-11-28 type:feature owner:fujiwara bugzilla:562523
 Patch2:                 %{name}-02-cp-utf8.diff
-# date:2009-01-22 type:bug owner:halton bugzilla568646:
-Patch3:                 %{name}-03-typo.diff
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
 Autoreqprov:		on
@@ -62,7 +60,6 @@
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -134,6 +131,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Feb 09 2009 - [email protected]
+- Bump to 2.25.90
+- Remove upstreamed patch typo.diff
 * Sat Jan 24 2009 - [email protected]
 - Enable libunique explicitly
 * Tue Jan 22 2009 - [email protected]

--- a/patches/vino-01-menu-entry.diff	Mon Feb 09 07:41:23 2009 +0000
+++ b/patches/vino-01-menu-entry.diff	Mon Feb 09 07:46:50 2009 +0000
@@ -1,9 +1,9 @@
-diff -r -u vino-2.22.2-orig/capplet/vino-preferences.desktop.in.in vino-2.22.2/capplet/vino-preferences.desktop.in.in
---- vino-2.22.2-orig/capplet/vino-preferences.desktop.in.in	2008-07-09 16:25:36.972371262 +0800
-+++ vino-2.22.2/capplet/vino-preferences.desktop.in.in	2008-07-09 16:28:16.717016316 +0800
-@@ -1,7 +1,9 @@
+Index: trunk/capplet/vino-preferences.desktop.in.in
+===================================================================
+--- trunk/capplet/vino-preferences.desktop.in.in	(revision 1078)
++++ trunk/capplet/vino-preferences.desktop.in.in	(working copy)
+@@ -1,6 +1,8 @@
  [Desktop Entry]
- Encoding=UTF-8
 -_Name=Remote Desktop
 -_Comment=Set your remote desktop access preferences
 +# SUN_BRANDING

--- a/patches/vino-03-typo.diff	Mon Feb 09 07:41:23 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Index: trunk/server/vino-dbus-listener.c
-===================================================================
---- trunk/server/vino-dbus-listener.c	(revision 1052)
-+++ trunk/server/vino-dbus-listener.c	(working copy)
-@@ -263,7 +263,7 @@
-     goto oom;
- 
- #ifdef VINO_ENABLE_HTTP_SERVER
--  port = vino_get_http_server_port (listener->priv->server));
-+  port = vino_get_http_server_port (listener->priv->server);
- #else
-   port = vino_server_get_port (listener->priv->server);
- #endif