--- a/ChangeLog	Tue Feb 17 04:02:58 2009 +0000
+++ b/ChangeLog	Tue Feb 17 04:31:37 2009 +0000
@@ -1,9 +1,17 @@
+2009-02-17  Halton Huo  <[email protected]>
+
+	* SUNWgnome-remote-desktop.spec: Update %files,
+	  move autostart/vino-server.desktop to -root pkg
+	* base-specs/vinagre.spec: Bump to 2.25.91
+	* base-specs/vino.spec: Bump to 2.25.91
+	* patches/vino-01-menu-entry.diff: rework
+
 2009-02-17  Jerry Tan <[email protected]>
 
-        * base-specs/tracker.spec
-        * patches/tracker-15-libumem-check.diff
-        * patches/tracker-16-extract-jpeg-core-dump.diff
-        add patch to fix bug 6763771, bug 6802570
+	* base-specs/tracker.spec
+	* patches/tracker-15-libumem-check.diff
+	* patches/tracker-16-extract-jpeg-core-dump.diff
+	add patch to fix bug 6763771, bug 6802570
 
 2009-02-17  Dave Lin <[email protected]>
 

--- a/SUNWgnome-remote-desktop.spec	Tue Feb 17 04:02:58 2009 +0000
+++ b/SUNWgnome-remote-desktop.spec	Tue Feb 17 04:31:37 2009 +0000
@@ -158,9 +158,6 @@
 %{_datadir}/vino
 %dir %attr (0755, root, other) %{_datadir}/applications
 %{_datadir}/applications/*
-%dir %attr (0755, root, other) %{_datadir}/gnome
-%dir %attr (0755, root, bin) %{_datadir}/gnome/autostart
-%{_datadir}/gnome/autostart/vino-server.desktop
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
@@ -176,9 +173,12 @@
 %defattr (-, root, sys)
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/vino-server.schemas
+%{_sysconfdir}/xdg/autostart/vino-server.desktop
 
 %changelog
 * Sat Jan 24 2009 - [email protected]
+- Update %files, move autostart/vino-server.desktop to -root pkg.
+* Sat Jan 24 2009 - [email protected]
 - Add Requires to libunique package
 * Wed Nov 05 2008 - [email protected]
 - Add po/ChangeLog to %files

--- a/base-specs/vinagre.spec	Tue Feb 17 04:02:58 2009 +0000
+++ b/base-specs/vinagre.spec	Tue Feb 17 04:31:37 2009 +0000
@@ -11,7 +11,7 @@
 Name:           vinagre
 License:        GPL v2
 Group:          Development/Libraries
-Version:        2.25.90
+Version:        2.25.91
 Release:        1
 Distribution:   Java Desktop System
 Vendor:         Sun Microsystems, Inc.
@@ -86,6 +86,8 @@
 %{_libdir}/bonobo/servers/GNOME_RemoteDesktop.server
 
 %changelog
+* Tue Feb 17 2009 - [email protected]
+- Bump to 2.25.91
 * Thu Feb 05 2009 - [email protected]
 - Bump to 2.25.90.
 * Tue Jan 22 2009 - [email protected]

--- a/base-specs/vino.spec	Tue Feb 17 04:02:58 2009 +0000
+++ b/base-specs/vino.spec	Tue Feb 17 04:31:37 2009 +0000
@@ -11,7 +11,7 @@
 Name:			vino
 License:		GPL v2
 Group:			System/GUI/GNOME
-Version:		2.25.90
+Version:		2.25.91
 Release:		2
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -131,6 +131,8 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Feb 17 2009 - [email protected]
+- Bump to 2.25.91
 * Mon Feb 09 2009 - [email protected]
 - Bump to 2.25.90
 - Remove upstreamed patch typo.diff

--- a/patches/vino-01-menu-entry.diff	Tue Feb 17 04:02:58 2009 +0000
+++ b/patches/vino-01-menu-entry.diff	Tue Feb 17 04:31:37 2009 +0000
@@ -1,15 +1,12 @@
 Index: trunk/capplet/vino-preferences.desktop.in.in
 ===================================================================
---- trunk/capplet/vino-preferences.desktop.in.in	(revision 1078)
+--- trunk/capplet/vino-preferences.desktop.in.in	(revision 1106)
 +++ trunk/capplet/vino-preferences.desktop.in.in	(working copy)
-@@ -1,6 +1,8 @@
+@@ -1,5 +1,6 @@
  [Desktop Entry]
 -_Name=Remote Desktop
--_Comment=Set your remote desktop access preferences
 +# SUN_BRANDING
 +_Name=Desktop Sharing
-+# SUN_BRANDING
-+_Comment=Choose how other users can remotely view your desktop
+ _Comment=Choose how other users can remotely view your desktop
  Exec=vino-preferences
  Icon=preferences-desktop-remote-desktop
- Terminal=false