OBS User unknown 2009-02-23 11:59:10 +00:00 committed by Git OBS Bridge
parent a676dea12c
commit e11b9c9ae7
5 changed files with 100 additions and 57 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d2ba5646125f367975dbb82d8f4c803243bc80e6ba803b9526ebca1b9aa8056
size 5861126

3
nautilus-2.25.91.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63031f4c60fde7ce15a08e9588b99db1ad1f4e03c8c0281b8c65f0ff0ad74e0c
size 5868631

View File

@ -15,10 +15,10 @@ folder is more recognizable than a filing cabinet.
4 files changed, 4 insertions(+), 4 deletions(-)
Index: nautilus-2.25.3/nautilus-file-management-properties.desktop.in.in
Index: nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in
===================================================================
--- nautilus-2.25.3.orig/nautilus-file-management-properties.desktop.in.in
+++ nautilus-2.25.3/nautilus-file-management-properties.desktop.in.in
--- nautilus-2.25.91.orig/nautilus-file-management-properties.desktop.in.in
+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=File Management
_Comment=Change the behaviour and appearance of file manager windows
@ -28,22 +28,23 @@ Index: nautilus-2.25.3/nautilus-file-management-properties.desktop.in.in
Terminal=false
Type=Application
StartupNotify=true
Index: nautilus-2.25.3/nautilus.desktop.in.in
Index: nautilus-2.25.91/nautilus.desktop.in.in
===================================================================
--- nautilus-2.25.3.orig/nautilus.desktop.in.in
+++ nautilus-2.25.3/nautilus.desktop.in.in
@@ -3,6 +3,7 @@ Encoding=UTF-8
--- nautilus-2.25.91.orig/nautilus.desktop.in.in
+++ nautilus-2.25.91/nautilus.desktop.in.in
@@ -2,7 +2,7 @@
Encoding=UTF-8
_Name=File Manager
Exec=nautilus
Icon=system-file-manager
-Icon=system-file-manager
+Icon=gnome-fs-directory
Terminal=false
Type=Application
StartupNotify=true
Index: nautilus-2.25.3/src/nautilus-file-management-properties.c
Index: nautilus-2.25.91/src/nautilus-file-management-properties.c
===================================================================
--- nautilus-2.25.3.orig/src/nautilus-file-management-properties.c
+++ nautilus-2.25.3/src/nautilus-file-management-properties.c
--- nautilus-2.25.91.orig/src/nautilus-file-management-properties.c
+++ nautilus-2.25.91/src/nautilus-file-management-properties.c
@@ -806,7 +806,7 @@ nautilus_file_management_properties_dial
(GClosureNotify)g_object_unref,
0);
@ -53,10 +54,10 @@ Index: nautilus-2.25.3/src/nautilus-file-management-properties.c
if (window) {
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
Index: nautilus-2.25.3/src/nautilus-navigation-window.c
Index: nautilus-2.25.91/src/nautilus-navigation-window.c
===================================================================
--- nautilus-2.25.3.orig/src/nautilus-navigation-window.c
+++ nautilus-2.25.3/src/nautilus-navigation-window.c
--- nautilus-2.25.91.orig/src/nautilus-navigation-window.c
+++ nautilus-2.25.91/src/nautilus-navigation-window.c
@@ -1220,7 +1220,7 @@ static NautilusIconInfo *
real_get_icon (NautilusWindow *window,
NautilusWindowSlot *slot)

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Mon Feb 23 01:59:50 CET 2009 - vuntz@novell.com
- Update to version 2.25.91:
+ Use G_DEFINE_TYPE_* instead of hand-written types
+ fix: opening a new window restores minimised ones
+ fix renaming of desktop files
+ Handle new kinds of GIcons
+ Don't display shadowed mounts
- Remove BuildRequires: fontconfig-devel
- Remove unneeded CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
- Remove unneeded chmod -x COPYING
- Add temporary workaround for broken gtk-doc: gtkdocize --copy
- Add --enable-gtk-doc configure flag.
- Remove "make nautilus.desktop src/network-scheme.desktop" since
this was for a patch that we don't have anymore.
- Call suse_update_desktop_file on nautilus-browser.
- Stop packaging as docs some internal documentation that, IMHO,
should not be part of a package.
- Update
nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
to not have two Icon keys in nautilus.desktop.
-------------------------------------------------------------------
Tue Feb 3 07:47:57 EST 2009 - mboman@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package nautilus (Version 2.25.4)
# spec file for package nautilus (Version 2.25.91)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,7 +20,6 @@
Name: nautilus
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-icon-theme
@ -36,7 +35,7 @@ BuildRequires: unique-devel
BuildRequires: update-desktop-files
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.25.4
Version: 2.25.91
Release: 1
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
@ -90,27 +89,24 @@ gnome-patch-translation-prepare
%patch4 -p1
%patch5 -p1
#%patch9 -p0
### %patch10
### %patch15 -p1
%patch20 -p1
#%patch21 -p1
gnome-patch-translation-update
%build
# FIXME temporary workaround for 2.25.91 which was generated with an old
# gtk-doc:
gtkdocize --copy
autoreconf -f -i
# needed for nautilus-2.16.1:
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--disable-update-mimedb
# only for patch2:
make nautilus.desktop src/network-scheme.desktop
--disable-update-mimedb \
--enable-gtk-doc
%__make %{?jobs:-j%jobs}
chmod -x COPYING
%install
%makeinstall
rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
rm docs/Makefile*
### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
# FIXME: this is probably wrong, but it enables the build to succeed for now
# ln -s ../icons/gnome/24x24/devices/gnome-computer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
@ -120,6 +116,7 @@ ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/
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-autorun-software
%suse_update_desktop_file nautilus-browser
%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
@ -155,7 +152,7 @@ fi
%files -f %{name}.lst
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO docs/*
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
%{_bindir}/*
%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/*.xml
@ -182,10 +179,32 @@ fi
%{_libdir}/*.so
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
# I'd put this in a -doc package, but it's only useful for developers AFAICT
%{_datadir}/gtk-doc/html/libnautilus-extension
# Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/*
%changelog
* Mon Feb 23 2009 vuntz@novell.com
- Update to version 2.25.91:
+ Use G_DEFINE_TYPE_* instead of hand-written types
+ fix: opening a new window restores minimised ones
+ fix renaming of desktop files
+ Handle new kinds of GIcons
+ Don't display shadowed mounts
- Remove BuildRequires: fontconfig-devel
- Remove unneeded CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
- Remove unneeded chmod -x COPYING
- Add temporary workaround for broken gtk-doc: gtkdocize --copy
- Add --enable-gtk-doc configure flag.
- Remove "make nautilus.desktop src/network-scheme.desktop" since
this was for a patch that we don't have anymore.
- Call suse_update_desktop_file on nautilus-browser.
- Stop packaging as docs some internal documentation that, IMHO,
should not be part of a package.
- Update
nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
to not have two Icon keys in nautilus.desktop.
* Tue Feb 03 2009 mboman@suse.de
- Update to version 2.25.4:
+ Don't show desktop files from other desktops than Gnome on the
@ -258,9 +277,9 @@ fi
* Wed Jan 28 2009 vuntz@novell.com
- Updated nautilus-456702-trash-restore.patch to use the patch
committed upstream.
* Thu Jan 22 2009 mxwu@novell.com
* Fri Jan 23 2009 mxwu@novell.com
- Added nautilus-456702-trash-restore.patch (bnc#456702)
* Thu Dec 04 2008 hpj@novell.com
* Fri Dec 05 2008 hpj@novell.com
- Added nautilus-new-windows-after-mount.patch (bnc#437780,
bgo#524485).
* Sun Nov 30 2008 vuntz@novell.com
@ -268,7 +287,7 @@ fi
mandatory on SLES/SLED.
(This was initially done by Federico, but I redid it to remove
both %%sles_version)
* Tue Nov 11 2008 federico@novell.com
* 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.
@ -373,7 +392,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
@ -451,14 +470,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
@ -501,7 +520,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.
@ -533,7 +552,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
@ -555,7 +574,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
@ -772,7 +791,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
@ -898,7 +917,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
@ -909,14 +928,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 <whatever>"
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
@ -963,7 +982,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.
@ -974,7 +993,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
@ -986,7 +1005,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
@ -1009,7 +1028,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.
@ -1023,7 +1042,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.
@ -1033,7 +1052,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.
@ -1041,11 +1060,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
@ -1062,7 +1081,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.
@ -1118,7 +1137,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
@ -1165,7 +1184,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
@ -1338,7 +1357,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
@ -1352,7 +1371,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 <libpng> to <libpng-devel-packages>
* Thu Jan 24 2002 hhetter@suse.de
- initial SuSE package for GNOME 2.0 platform