Hello community, here is the log from the commit of package nautilus checked in at Fri Apr 25 16:33:36 CEST 2008. -------- --- GNOME/nautilus/nautilus.changes 2008-04-22 15:49:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2008-04-23 21:49:27.203203000 +0200 @@ -1,0 +2,11 @@ +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. + +------------------------------------------------------------------- Old: ---- nautilus-docpath.patch New: ---- nautilus-genericname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.h27859/_old 2008-04-25 16:33:23.000000000 +0200 +++ /var/tmp/diff_new_pack.h27859/_new 2008-04-25 16:33:23.000000000 +0200 @@ -16,7 +16,7 @@ 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 @@ 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/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 @@ %{_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 ++++++ nautilus-genericname.patch ++++++ Index: nautilus.desktop.in ================================================================================ --- nautilus.desktop.in.in +++ nautilus.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 _Name=File Browser -_Comment=Browse the file system with the file manager +_GenericName=Browse the file system with the file manager TryExec=nautilus Exec=nautilus --no-desktop --browser %U Icon=gnome-fs-directory ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org