diff --git a/nautilus.changes b/nautilus.changes index 6284ee5..380d4e2 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 30 23:41:55 CET 2008 - vuntz@novell.com + +- Remove sles_version conditional; make nautilus-search.desktop + mandatory on SLES/SLED. + (This was initially done by Federico, but I redid it to remove + both %sles_version) + ------------------------------------------------------------------- Tue Nov 11 18:27:21 CST 2008 - federico@novell.com diff --git a/nautilus.spec b/nautilus.spec index b06faec..a5bf9a9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -41,7 +41,7 @@ BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/File utilities Version: 2.24.1 -Release: 5 +Release: 6 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 @@ -104,9 +104,7 @@ features of the Nautilus file manager. %prep %setup -q gnome-patch-translation-prepare -%if ! %sles_version %patch4 -p1 -%endif %patch5 -p1 %patch6 -p0 %patch7 @@ -150,9 +148,7 @@ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixm %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 -%if ! %sles_version %suse_update_desktop_file -G "Nautilus Search Tool" nautilus-search System FileManager -%endif %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 @@ -209,7 +205,12 @@ fi %{_datadir}/gtk-doc/html/libnautilus-extension %changelog -* Tue Nov 11 2008 federico@novell.com +* Sun Nov 30 2008 vuntz@novell.com +- Remove sles_version conditional; make nautilus-search.desktop + mandatory on SLES/SLED. + (This was initially done by Federico, but I redid it to remove + both %%sles_version) +* Wed Nov 12 2008 federico@novell.com - Updated nautilus-sysadmin-desktop-items.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=438277 - icon positions in the desktop don't get restored. @@ -314,7 +315,7 @@ fi + Show file name instead of URI in the bookmark editor window for local files + Polish "Visible Columns" list view dialog. -* Fri Aug 08 2008 maw@suse.de +* Sat Aug 09 2008 maw@suse.de - Update to version 2.23.6.1: + Support transferring files with reserved FAT characters to a FAT file system; replace them with an underscore if neccessary @@ -392,14 +393,14 @@ fi + Respin the following patches: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff and nautilus-bnc363122-lockdown-context-menus.diff. -* Fri Jun 06 2008 hpj@suse.de +* Sat Jun 07 2008 hpj@suse.de - Back out nautilus-bnc376669-always-update-thumbnail.patch (bnc#376669). * Fri Jun 06 2008 rodrigo@suse.de - Add nautilus-bnc397852-huge-memory-leak.patch (bnc#397852) * Wed May 21 2008 hpj@suse.de - Add nautilus-bnc393226-dont-move-to-burn.patch (bnc#393226). -* Mon May 19 2008 hpj@suse.de +* Tue May 20 2008 hpj@suse.de - Add nautilus-bnc376669-always-update-thumbnail.patch (bnc#376669). * Thu May 01 2008 hpj@suse.de - Removed previously disabled patches that were made obsolete by @@ -442,7 +443,7 @@ fi * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support -* Wed Apr 02 2008 hpj@suse.de +* Thu Apr 03 2008 hpj@suse.de - Upgraded to version 2.22.1: * Fix crashes and leaks. * Fix emblem display in property page. @@ -474,7 +475,7 @@ fi - Add back gtk2-devel to the devel requires * Fri Mar 21 2008 vuntz@suse.de - Add a gnome-desktop-devel buildrequires to fix the build. -* Thu Mar 20 2008 jpr@suse.de +* Fri Mar 21 2008 jpr@suse.de - Remove obsolete -devel package requries - Remove medusa obsoletes, not relevant to any shipping distros * Thu Mar 13 2008 sbrabec@suse.cz @@ -496,7 +497,7 @@ fi - Use %%suse_update_desktop_file for nautilus-autorun-software and nautilus-folder-handler to mark them as translatable. - Add nautilus-bnc366455-change-ownership.patch to fix bnc#366455. -* Tue Mar 04 2008 maw@suse.de +* Wed Mar 05 2008 maw@suse.de - Update to version 2.21.92: + Build fixes + Fix crashes and leaks @@ -713,7 +714,7 @@ fi - Fix clash with symbol names in gtk+ * Wed Sep 20 2006 sbrabec@suse.cz - Update MIME database in scriptlets (#201729). -* Wed Sep 13 2006 jhargadon@suse.de +* Thu Sep 14 2006 jhargadon@suse.de - update to version 2.16.0 - Handle enter activation when using typeahead search - Avoid using gnome_vfs_is_local in wrong places @@ -839,7 +840,7 @@ fi - Fixed I18N problems: * untranslatable Search string (#173448) * uninitialized locale (#173448#c3) -* Tue May 16 2006 federico@novell.com +* Wed May 17 2006 federico@novell.com - Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=176123. The "OnlyShowIn" key in desktop files can contain multiple items. Also @@ -850,14 +851,14 @@ fi toggle button to the left of path bar in navigation windows. Pressing this button will switch to using a location entry instead of the path bar. -* Thu May 11 2006 federico@novell.com +* Fri May 12 2006 federico@novell.com - Updated nautilus-155010-desktop-volume-policy.diff; this fixes https://bugzilla.novell.com/show_bug.cgi?id=175076. This fixes a crash when dragging a volume to the trash. * Wed May 10 2006 joeshaw@suse.de - Update search patch to remove annoying "queuing " debug spew. -* Tue May 09 2006 federico@novell.com +* Wed May 10 2006 federico@novell.com - Added nautilus-142860-vfs-drive-for-extensions.diff to fix the Nautilus part of bug https://bugzilla.novell.com/show_bug.cgi?id=142860. This lets @@ -904,7 +905,7 @@ fi - Added nautilus-155337-icon-positioning-on-reload.diff to fix bug [#155337]. Now icons in the desktop are not repositioned if the desktop gets reloaded. -* Thu Mar 16 2006 federico@novell.com +* Fri Mar 17 2006 federico@novell.com - Added nautilus-perf-no-burn-uri-for-desktop.diff. This makes Nautilus not do unnecessary work when initializing the desktop, saving 1 second during login. @@ -915,7 +916,7 @@ fi - use beagle on ppc64 as well * Thu Mar 02 2006 sbrabec@suse.cz - Translations from upstream moved to gnome-patch-translation. -* Thu Feb 23 2006 federico@novell.com +* Fri Feb 24 2006 federico@novell.com - Added nautilus-130796-bad-icon-placement.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=130796. This makes desktop icons with very wide labels be placed correctly, instead of @@ -927,7 +928,7 @@ fi isn't running. * Sun Feb 19 2006 aj@suse.de - Reduce BuildRequires. -* Fri Feb 17 2006 gekker@suse.de +* Sat Feb 18 2006 gekker@suse.de - ficup .desktop files for UI team * Mon Feb 13 2006 federico@novell.com - Added nautilus-130796-bad-icon-placement.diff to fix @@ -950,7 +951,7 @@ fi - converted neededforbuild to BuildRequires * Mon Jan 23 2006 joeshaw@suse.de - Update search patch to only search the files backend -* Tue Jan 17 2006 gekker@suse.de +* Wed Jan 18 2006 gekker@suse.de - Remove Requires: on control-center2 and gnome-themes (#142237) * Tue Dec 06 2005 sbrabec@suse.cz - Do not require beagle on ppc64. @@ -964,7 +965,7 @@ fi * Thu Dec 01 2005 federico@novell.com - Updated nautilus-6014-network-servers-desktop-icon.diff. When doing "Clean up by Name", the Network Servers icon will now be put after your Home icon. -* Wed Nov 30 2005 federico@novell.com +* Thu Dec 01 2005 federico@novell.com - Added nautilus-6014-network-servers-desktop-icon.diff to fix bug #6014. This Creates a "Network Servers" icon in the desktop. - Added nautilus-136167-no-default-window.diff to fix bug #136167. @@ -974,7 +975,7 @@ fi - Update to version 2.12.2 * Mon Nov 28 2005 gekker@suse.de - Enable nauilus sidebar by default (#132383). -* Wed Nov 16 2005 federico@novell.com +* Thu Nov 17 2005 federico@novell.com - Added nautilus-default-thumbnail-size.diff. This makes the default size for thumbnails be 64 pixels, which looks better with the default theme than the old value of 96 pixels. @@ -982,11 +983,11 @@ fi - Update nautilus-search patch to 20051101. - Add patch to hide the zoom and "view as" controls from the location bar. -* Mon Nov 07 2005 federico@novell.com +* Tue Nov 08 2005 federico@novell.com - Added nautilus-115467-dont-overlap-volume-icons.diff to fix part of bug #115467. With this, Nautilus will not overlap the icons when you insert a CD or USB stick. -* Tue Nov 01 2005 federico@novell.com +* Wed Nov 02 2005 federico@novell.com - Updated nautilus-submount.patch to fix bug #127509. With this, the "Unmount volume" command will appear again for network volumes. * Thu Oct 13 2005 gekker@suse.de @@ -1003,7 +1004,7 @@ fi - Add DocPath to .desktop file * Thu Oct 06 2005 sbrabec@suse.de - Require gnome-themes. -* Tue Oct 04 2005 federico@novell.com +* Wed Oct 05 2005 federico@novell.com - Added nautilus-consistent-home-folder-name.diff to make the name of $HOME consistent between the path bar and side bar in Nautilus and GtkFileChooser. @@ -1059,7 +1060,7 @@ fi - Update to version 2.10.0 (GNOME 2.10). * Mon Mar 07 2005 gekker@suse.de - Add nautilus-background-memory.patch -* Thu Mar 03 2005 gekker@suse.de +* Fri Mar 04 2005 gekker@suse.de - Update to version 2.9.92 * Fri Feb 11 2005 gekker@suse.de - Update to 2.9.91 @@ -1106,7 +1107,7 @@ fi * Tue Sep 21 2004 hhetter@suse.de - show "drives:" location instead of "computer:" and recognize /var/lib/Desktop -* Tue Sep 07 2004 clahey@suse.de +* Wed Sep 08 2004 clahey@suse.de - Added OnlyShowIn=GNOME;. * Tue Aug 24 2004 dave@suse.de - Added nautilus-location-crash.patch, ximian bug #63445 @@ -1279,7 +1280,7 @@ fi - gnome-common in #neededforbuild * Fri Jun 07 2002 hhetter@suse.de - really build nautilus treeview and notes -* Wed Jun 05 2002 ro@suse.de +* Thu Jun 06 2002 ro@suse.de - fix libdir usage * Wed Jun 05 2002 hhetter@suse.de - added missing pkgtool files @@ -1293,7 +1294,7 @@ fi * Tue May 07 2002 ro@suse.de - up to 1.1.15 - added gail to neededforbuild (for eel2) -* Thu Jan 31 2002 ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild to * Thu Jan 24 2002 hhetter@suse.de - initial SuSE package for GNOME 2.0 platform