rpms/nautilus/devel nautilus-gvfs-desktop-key-2.patch, NONE, 1.1 .cvsignore, 1.85, 1.86 nautilus.spec, 1.237, 1.238 sources, 1.89, 1.90 nautilus-gvfs-desktop-key.patch, 1.1, NONE

Tue Dec 2 15:20:44 UTC 2008

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31684

Modified Files:
	.cvsignore nautilus.spec sources 
Added Files:
	nautilus-gvfs-desktop-key-2.patch 
Removed Files:
	nautilus-gvfs-desktop-key.patch 
Log Message:
* Tue Dec  2 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.25.1-1
- Update to 2.25.1


nautilus-gvfs-desktop-key-2.patch:

--- NEW FILE nautilus-gvfs-desktop-key-2.patch ---
diff -up nautilus-2.25.1/nautilus-browser.desktop.in.orig nautilus-2.25.1/nautilus-browser.desktop.in
--- nautilus-2.25.1/nautilus-browser.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
+++ nautilus-2.25.1/nautilus-browser.desktop.in	2008-12-02 16:10:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=File Browser
 _Comment=Browse the file system with the file manager
 TryExec=nautilus
 Exec=nautilus --no-desktop --browser %U
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/src/network-scheme.desktop.in.orig nautilus-2.25.1/src/network-scheme.desktop.in
--- nautilus-2.25.1/src/network-scheme.desktop.in.orig	2008-09-14 14:14:22.000000000 +0200
+++ nautilus-2.25.1/src/network-scheme.desktop.in	2008-12-02 16:14:43.720426420 +0100
@@ -4,6 +4,7 @@ _Name=Network
 _Comment=Browse bookmarked and local network locations
 TryExec=nautilus
 Exec=nautilus --no-desktop network:
+X-Gnome-Vfs-System=gio
 Terminal=false
 StartupNotify=true
 Type=Application
diff -up nautilus-2.25.1/nautilus-browser.desktop.in.in.orig nautilus-2.25.1/nautilus-browser.desktop.in.in
--- nautilus-2.25.1/nautilus-browser.desktop.in.in.orig	2008-10-02 14:26:49.000000000 +0200
+++ nautilus-2.25.1/nautilus-browser.desktop.in.in	2008-12-02 16:10:54.000000000 +0100
@@ -4,6 +4,7 @@ _Name=File Browser
 _Comment=Browse the file system with the file manager
 TryExec=nautilus
 Exec=nautilus --no-desktop --browser %U
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/nautilus-autorun-software.desktop.in.orig nautilus-2.25.1/nautilus-autorun-software.desktop.in
--- nautilus-2.25.1/nautilus-autorun-software.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
+++ nautilus-2.25.1/nautilus-autorun-software.desktop.in	2008-12-02 16:14:43.719759795 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=Autorun Prompt
 TryExec=nautilus-autorun-software
 Exec=nautilus-autorun-software %u
+X-Gnome-Vfs-System=gio
 Icon=application-x-executable
 NoDisplay=true
 Terminal=false
diff -up nautilus-2.25.1/nautilus.desktop.in.in.orig nautilus-2.25.1/nautilus.desktop.in.in
--- nautilus-2.25.1/nautilus.desktop.in.in.orig	2008-10-02 14:26:50.000000000 +0200
+++ nautilus-2.25.1/nautilus.desktop.in.in	2008-12-02 16:09:52.000000000 +0100
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 _Name=File Manager
 Exec=nautilus
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 Type=Application
diff -up nautilus-2.25.1/nautilus-folder-handler.desktop.in.in.orig nautilus-2.25.1/nautilus-folder-handler.desktop.in.in
--- nautilus-2.25.1/nautilus-folder-handler.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.1/nautilus-folder-handler.desktop.in.in	2008-12-02 16:14:43.777093017 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=Open Folder
 TryExec=nautilus
 Exec=nautilus --no-desktop %U
+X-Gnome-Vfs-System=gio
 NoDisplay=true
 Terminal=false
 Icon=folder-open
diff -up nautilus-2.25.1/nautilus.desktop.orig nautilus-2.25.1/nautilus.desktop
--- nautilus-2.25.1/nautilus.desktop.orig	2008-12-01 11:59:05.000000000 +0100
+++ nautilus-2.25.1/nautilus.desktop	2008-12-02 16:10:32.000000000 +0100
@@ -92,6 +92,7 @@ Name[zh_HK]=æª”æ¡ˆç¸½ç®¡
 Name[zh_TW]=æª”æ¡ˆç¸½ç®¡
 Name[zu]=Mphathi Hele
 Exec=nautilus
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 Type=Application
diff -up nautilus-2.25.1/nautilus-autorun-software.desktop.in.in.orig nautilus-2.25.1/nautilus-autorun-software.desktop.in.in
--- nautilus-2.25.1/nautilus-autorun-software.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.1/nautilus-autorun-software.desktop.in.in	2008-12-02 16:14:43.827591738 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=Autorun Prompt
 TryExec=nautilus-autorun-software
 Exec=nautilus-autorun-software %u
+X-Gnome-Vfs-System=gio
 Icon=application-x-executable
 NoDisplay=true
 Terminal=false
diff -up nautilus-2.25.1/nautilus.desktop.in.orig nautilus-2.25.1/nautilus.desktop.in
--- nautilus-2.25.1/nautilus.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
+++ nautilus-2.25.1/nautilus.desktop.in	2008-12-02 16:10:17.000000000 +0100
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 _Name=File Manager
 Exec=nautilus
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 Type=Application
diff -up nautilus-2.25.1/nautilus-home.desktop.in.orig nautilus-2.25.1/nautilus-home.desktop.in
--- nautilus-2.25.1/nautilus-home.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
+++ nautilus-2.25.1/nautilus-home.desktop.in	2008-12-02 16:14:43.911840155 +0100
@@ -4,6 +4,7 @@ _Name=Home Folder
 _Comment=Open your personal folder
 TryExec=nautilus
 Exec=nautilus --no-desktop
+X-Gnome-Vfs-System=gio
 Icon=user-home
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/nautilus-computer.desktop.in.in.orig nautilus-2.25.1/nautilus-computer.desktop.in.in
--- nautilus-2.25.1/nautilus-computer.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.1/nautilus-computer.desktop.in.in	2008-12-02 16:14:43.936451077 +0100
@@ -4,6 +4,7 @@ _Name=Computer
 _Comment=Browse all local and remote disks and folders accessible from this computer
 TryExec=nautilus
 Exec=nautilus --no-desktop computer:
+X-Gnome-Vfs-System=gio
 Icon=computer
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/nautilus-home.desktop.in.in.orig nautilus-2.25.1/nautilus-home.desktop.in.in
--- nautilus-2.25.1/nautilus-home.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.1/nautilus-home.desktop.in.in	2008-12-02 16:14:43.961667122 +0100
@@ -4,6 +4,7 @@ _Name=Home Folder
 _Comment=Open your personal folder
 TryExec=nautilus
 Exec=nautilus --no-desktop
+X-Gnome-Vfs-System=gio
 Icon=user-home
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/nautilus-computer.desktop.in.orig nautilus-2.25.1/nautilus-computer.desktop.in
--- nautilus-2.25.1/nautilus-computer.desktop.in.orig	2008-12-01 11:58:55.000000000 +0100
+++ nautilus-2.25.1/nautilus-computer.desktop.in	2008-12-02 16:14:44.028541929 +0100
@@ -4,6 +4,7 @@ _Name=Computer
 _Comment=Browse all local and remote disks and folders accessible from this computer
 TryExec=nautilus
 Exec=nautilus --no-desktop computer:
+X-Gnome-Vfs-System=gio
 Icon=computer
 Terminal=false
 StartupNotify=true
diff -up nautilus-2.25.1/nautilus-file-management-properties.desktop.in.orig nautilus-2.25.1/nautilus-file-management-properties.desktop.in
--- nautilus-2.25.1/nautilus-file-management-properties.desktop.in.orig	2008-12-01 11:58:55.000000000 +0100
+++ nautilus-2.25.1/nautilus-file-management-properties.desktop.in	2008-12-02 16:14:44.053759916 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=File Management
 _Comment=Change the behaviour and appearance of file manager windows
 Exec=nautilus-file-management-properties
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 Type=Application
diff -up nautilus-2.25.1/nautilus-folder-handler.desktop.in.orig nautilus-2.25.1/nautilus-folder-handler.desktop.in
--- nautilus-2.25.1/nautilus-folder-handler.desktop.in.orig	2008-12-01 11:58:56.000000000 +0100
+++ nautilus-2.25.1/nautilus-folder-handler.desktop.in	2008-12-02 16:14:44.078976570 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=Open Folder
 TryExec=nautilus
 Exec=nautilus --no-desktop %U
+X-Gnome-Vfs-System=gio
 NoDisplay=true
 Terminal=false
 Icon=folder-open
diff -up nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in.orig nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in
--- nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in.orig	2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.1/nautilus-file-management-properties.desktop.in.in	2008-12-02 16:14:44.104262369 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
 _Name=File Management
 _Comment=Change the behaviour and appearance of file manager windows
 Exec=nautilus-file-management-properties
+X-Gnome-Vfs-System=gio
 Icon=system-file-manager
 Terminal=false
 Type=Application


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	26 Nov 2008 13:27:55 -0000	1.85
+++ .cvsignore	2 Dec 2008 15:20:13 -0000	1.86
@@ -1 +1 @@
-nautilus-2.24.2.tar.bz2
+nautilus-2.25.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- nautilus.spec	26 Nov 2008 13:27:55 -0000	1.237
+++ nautilus.spec	2 Dec 2008 15:20:13 -0000	1.238
@@ -1,4 +1,4 @@
-%define glib2_version 2.18.3
+%define glib2_version 2.19.2
 %define pango_version 1.1.3
 %define gtk2_version 2.11.6
 %define libgnomeui_version 2.6.0
@@ -18,7 +18,7 @@
 
 Name:		nautilus
 Summary:        File manager for GNOME
-Version: 	2.24.2
+Version: 	2.25.1
 Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
@@ -91,7 +91,7 @@
 Patch7:		rtl-fix.patch
 #Patch8:		nautilus-2.22.1-hide-white-screen.patch
 
-Patch10:        nautilus-gvfs-desktop-key.patch
+Patch10:        nautilus-gvfs-desktop-key-2.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=171655
 Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
@@ -134,7 +134,7 @@
 %patch6 -p1 -b .dynamic-search
 %patch7 -p1 -b .rtl-fix
 # %patch8 -p1 -b .hide-white-screen
-%patch10 -p0 -b .gvfs-desktop-key
+%patch10 -p1 -b .gvfs-desktop-key
 %patch15 -p0 -b .xds
 %patch17 -p0 -b .symlink
 
@@ -265,6 +265,9 @@
 
 
 %changelog
+* Tue Dec  2 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
 * Wed Nov 26 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.24.2-1
 - Update to 2.24.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	26 Nov 2008 13:27:56 -0000	1.89
+++ sources	2 Dec 2008 15:20:14 -0000	1.90
@@ -1 +1 @@
-783e5f7be6391d6c46b4725e38af475a  nautilus-2.24.2.tar.bz2
+287f08773a561bf504d2c6e07ada35b2  nautilus-2.25.1.tar.bz2


--- nautilus-gvfs-desktop-key.patch DELETED ---


