From c95ae35e1377ec7bbe02c06ca81594e18284315b188fe1e5f0f62fba08feb92f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 25 Apr 2008 14:33:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=33 --- ...ocpath.patch => nautilus-genericname.patch | 8 ------ nautilus.changes | 11 ++++++++ nautilus.spec | 26 ++++++++++++------- 3 files changed, 28 insertions(+), 17 deletions(-) rename nautilus-docpath.patch => nautilus-genericname.patch (63%) diff --git a/nautilus-docpath.patch b/nautilus-genericname.patch similarity index 63% rename from nautilus-docpath.patch rename to nautilus-genericname.patch index ea464aa..8fedf7a 100644 --- a/nautilus-docpath.patch +++ b/nautilus-genericname.patch @@ -11,11 +11,3 @@ Index: nautilus.desktop.in TryExec=nautilus Exec=nautilus --no-desktop --browser %U Icon=gnome-fs-directory -@@ -10,6 +10,7 @@ - Type=Application - Categories=GNOME;Application;System;Utility;Core; - OnlyShowIn=GNOME; -+DocPath=user-guide#gosnautilus-1 - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=nautilus - X-GNOME-Bugzilla-Component=general diff --git a/nautilus.changes b/nautilus.changes index 8d6b997..03a11dc 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Apr 23 21:52:31 CEST 2008 - vuntz@suse.de + +- Rename nautilus-docpath.patch to nautilus-genericname.patch and + drop the part of the patch adding a DocPath. +- Do not add DocPath to desktop files with + %suse_update_desktop_file +- Rationale: since the desktop files use the Core category, adding + DocPath means putting the items in the yelp toc, which we don't + want. + ------------------------------------------------------------------- Tue Apr 22 15:53:44 CEST 2008 - vuntz@suse.de diff --git a/nautilus.spec b/nautilus.spec index 741c401..c0a3997 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -16,7 +16,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gno License: GPL v2 or later Group: Productivity/File utilities Version: 2.22.2 -Release: 6 +Release: 9 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -27,8 +27,8 @@ Patch2: nautilus-name-length.patch Patch4: nautilus-search-desktop.patch # PATCH-NEEDS-REBASE nautilus-icon.patch bgo350962 bnc117333 federico@novell.com Patch5: nautilus-icon.patch -# PATCH-FIX-OPENSUSE nautilus-docpath.patch -Patch6: nautilus-docpath.patch +# PATCH-FIX-OPENSUSE nautilus-genericname.patch +Patch6: nautilus-genericname.patch # PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch # PATCH-NEEDS-REBASE nautilus-default-thumbnail-size.diff bgo350972 @@ -126,16 +126,16 @@ ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir ln -s ../icons/gnome/24x24/places/gnome-fs-home.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" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus System FileManager +%suse_update_desktop_file -N "Nautilus" -G "File Browser" nautilus System FileManager %suse_update_desktop_file nautilus-autorun-software -%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-computer System FileManager -%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file nautilus-computer System FileManager +%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" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-home System FileManager +%suse_update_desktop_file -G "File Browser" nautilus-home System FileManager %if ! %sles_version -%suse_update_desktop_file -G "Nautilus Search Tool" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-search System FileManager +%suse_update_desktop_file -G "Nautilus Search Tool" nautilus-search System FileManager %endif -%suse_update_desktop_file -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" network-scheme System Network +%suse_update_desktop_file -G "File Browser" network-scheme System Network mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0 %find_lang %{name} @@ -188,6 +188,14 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Wed Apr 23 2008 vuntz@suse.de +- Rename nautilus-docpath.patch to nautilus-genericname.patch and + drop the part of the patch adding a DocPath. +- Do not add DocPath to desktop files with + %%suse_update_desktop_file +- Rationale: since the desktop files use the Core category, adding + DocPath means putting the items in the yelp toc, which we don't + want. * Tue Apr 22 2008 vuntz@suse.de - Add nautilus-bnc368446-network-in-places.patch to add network:// in the places sidebar. Fix bnc#368446 (backported from upstream