From a15009bc1c84d1d3b970e0fc6731dbe8bab9497d60b16b47291cd11125d0d254 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 14 Jun 2010 10:58:44 +0000 Subject: [PATCH] Accepting request 41431 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 41431 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/41431 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=103 --- nautilus-bgo350950-search-desktop.diff | 3 ++- nautilus.changes | 14 ++++++++++++++ nautilus.spec | 12 ++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff index 9bd9f55..3394762 100644 --- a/nautilus-bgo350950-search-desktop.diff +++ b/nautilus-bgo350950-search-desktop.diff @@ -29,7 +29,7 @@ Index: nautilus-2.27.1/data/nautilus-search.desktop.in =================================================================== --- /dev/null +++ nautilus-2.27.1/data/nautilus-search.desktop.in -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Search for Files... @@ -140,6 +140,7 @@ Index: nautilus-2.27.1/data/nautilus-search.desktop.in +Type=Application +StartupNotify=true +Categories=Core; ++OnlyShowIn=GNOME; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=nautilus +X-GNOME-Bugzilla-Component=general diff --git a/nautilus.changes b/nautilus.changes index e0d9ef6..305cce4 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 14 11:24:19 CEST 2010 - vuntz@opensuse.org + +- Do not change the nautilus-browser, nautilus-computer, + nautilus-home, network-scheme .desktop files: they have + OnlyShowIn=GNOME and they are not supposed to be visible (but + they became visible because we changed them). +- Do not change the nautilus .desktop file: it has NoDisplay=true + anyway. +- Update nautilus-bgo350950-search-desktop.diff to have + OnlyShowIn=GNOME; and do not change nautilus-search.desktop with + suse_update_dekstop_file since this item is not visible in the + menus. + ------------------------------------------------------------------- Wed May 26 15:59:10 UTC 2010 - sshaw@decriptor.com diff --git a/nautilus.spec b/nautilus.spec index 1e62c38..12079a8 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -130,15 +130,15 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.*a # ln -s ../icons/gnome/24x24/devices/gnome-computer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -%suse_update_desktop_file -N "Nautilus" -G "File Browser" nautilus System FileManager +%suse_update_desktop_file nautilus %suse_update_desktop_file nautilus-autorun-software -%suse_update_desktop_file -r nautilus-browser System FileManager -%suse_update_desktop_file nautilus-computer System FileManager +%suse_update_desktop_file nautilus-browser +%suse_update_desktop_file nautilus-computer %suse_update_desktop_file nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file nautilus-folder-handler -%suse_update_desktop_file -G "File Browser" nautilus-home System FileManager -%suse_update_desktop_file -G "Nautilus Search Tool" nautilus-search System FileManager -%suse_update_desktop_file -G "File Browser" network-scheme System Network +%suse_update_desktop_file nautilus-home +%suse_update_desktop_file nautilus-search +%suse_update_desktop_file network-scheme # Install the archive mime handler test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop %{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop