diff --git a/nautilus-gvfs-desktop-key-2.patch b/nautilus-gvfs-desktop-key-2.patch deleted file mode 100644 index 13bf21b..0000000 --- a/nautilus-gvfs-desktop-key-2.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -up nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in ---- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in ---- nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-autorun-software.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-browser.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in ---- nautilus-2.29.1/data/nautilus-browser.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-browser.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/data/nautilus-browser.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-browser.desktop.in.in ---- nautilus-2.29.1/data/nautilus-browser.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-browser.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/data/nautilus-computer.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in ---- nautilus-2.29.1/data/nautilus-computer.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-computer.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/data/nautilus-computer.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-computer.desktop.in.in ---- nautilus-2.29.1/data/nautilus-computer.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-computer.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/data/nautilus.desktop.desktop-key nautilus-2.29.1/data/nautilus.desktop ---- nautilus-2.29.1/data/nautilus.desktop.desktop-key 2009-12-17 17:18:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus.desktop 2009-12-18 11:08:58.000000000 +0100 -@@ -100,6 +100,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.29.1/data/nautilus.desktop.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in ---- nautilus-2.29.1/data/nautilus.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -1,6 +1,7 @@ - [Desktop Entry] - _Name=File Manager - Exec=nautilus -+X-Gnome-Vfs-System=gio - Icon=system-file-manager - Terminal=false - Type=Application -diff -up nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus.desktop.in.in ---- nautilus-2.29.1/data/nautilus.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -1,6 +1,7 @@ - [Desktop Entry] - _Name=File Manager - Exec=nautilus -+X-Gnome-Vfs-System=gio - Icon=system-file-manager - Terminal=false - Type=Application -diff -up nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in ---- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in ---- nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-file-management-properties.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-folder-handler.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in ---- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.desktop-key 2009-12-17 17:18:10.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in ---- nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-folder-handler.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -2,6 +2,7 @@ - _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.29.1/data/nautilus-home.desktop.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in ---- nautilus-2.29.1/data/nautilus-home.desktop.in.desktop-key 2009-12-17 17:18:09.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-home.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/data/nautilus-home.desktop.in.in.desktop-key nautilus-2.29.1/data/nautilus-home.desktop.in.in ---- nautilus-2.29.1/data/nautilus-home.desktop.in.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/data/nautilus-home.desktop.in.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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.29.1/src/network-scheme.desktop.in.desktop-key nautilus-2.29.1/src/network-scheme.desktop.in ---- nautilus-2.29.1/src/network-scheme.desktop.in.desktop-key 2009-12-15 11:22:12.000000000 +0100 -+++ nautilus-2.29.1/src/network-scheme.desktop.in 2009-12-18 11:08:58.000000000 +0100 -@@ -3,6 +3,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 --git a/nautilus.spec b/nautilus.spec index 812a4b6..67337fa 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -81,8 +81,6 @@ Patch4: nautilus-selinux.patch Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch -Patch10: nautilus-gvfs-desktop-key-2.patch - # http://bugzilla.gnome.org/show_bug.cgi?id=519743 Patch17: nautilus-filetype-symlink-fix.patch @@ -126,7 +124,6 @@ for developing nautilus extensions. %patch4 -p1 -b .selinux %patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen -%patch10 -p1 -b .gvfs-desktop-key %patch17 -p0 -b .symlink %patch23 -p1 -b .gu_IN-crash %patch24 -p1 -b .eel-xlib @@ -142,7 +139,7 @@ automake # -fno-tree-vrp is needed to avoid gcc-4.4.0 optimization failure # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39233 -CFLAGS="$RPM_OPT_FLAGS -g -DUGLY_HACK_TO_DETECT_KDE -DNAUTILUS_OMIT_SELF_CHECK -fno-tree-vrp" %configure --disable-more-warnings --disable-update-mimedb +CFLAGS="$RPM_OPT_FLAGS -g -DNAUTILUS_OMIT_SELF_CHECK -fno-tree-vrp" %configure --disable-more-warnings --disable-update-mimedb # drop unneeded direct library deps with --as-needed # libtool doesn't make this easy, so we do it the hard way @@ -157,10 +154,6 @@ export tagname=CC LANG=en_US make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -## these are in desktop-backgrounds-basic -## (uncomment when we patch the source to look in the right place) -## /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/nautilus/patterns - # remove .desktop entry in applications > system tools # https://bugzilla.redhat.com/show_bug.cgi?id=583790 rm $RPM_BUILD_ROOT%{_datadir}/applications/nautilus-browser.desktop