rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.27.1

Browse Source
This commit is contained in:
Tomas Bzatek 2009-05-05 12:17:43 +00:00
parent c4e21749bf
commit d16dce2375
6 changed files with 58 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1,2 +1 @@
nautilus-2.26.1.tar.bz2
nautilus-2.26.2.tar.bz2
nautilus-2.27.1.tar.bz2

31
background-no-delay.patch
View File

@ -1,31 +0,0 @@
--- nautilus-2.13.4/libnautilus-private/nautilus-directory-background.c.no-delays 2006-02-06 15:44:27.000000000 -0500
+++ nautilus-2.13.4/libnautilus-private/nautilus-directory-background.c 2006-02-06 15:52:58.000000000 -0500
@@ -319,15 +319,20 @@
guint notification_timeout_id;
background = EEL_BACKGROUND (data);
- /*
- * Wallpaper capplet changes picture, background color and placement with
- * gconf_change_set API, but unfortunately, this operation is not atomic in
- * GConf as it should be. So we update background after small timeout to
- * let GConf change all values.
- */
- notification_timeout_id = g_timeout_add (300, (GSourceFunc) call_settings_changed, background);
- g_object_set_data (G_OBJECT (background), "desktop_gconf_notification_timeout", GUINT_TO_POINTER (notification_timeout_id));
+ notification_timeout_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (background), "desktop_gconf_notification_timeout"));
+
+ if (strcmp (entry->key, "/desktop/gnome/background/stamp") == 0) {
+ if (notification_timeout_id != 0)
+ g_source_remove (notification_timeout_id);
+
+ call_settings_changed (background);
+ }
+ else if (notification_timeout_id == 0) {
+ notification_timeout_id = g_timeout_add (300, (GSourceFunc) call_settings_changed, background);
+
+ g_object_set_data (G_OBJECT (background), "desktop_gconf_notification_timeout", GUINT_TO_POINTER (notification_timeout_id));
+ }
}
static void

25
nautilus-2.26.2-icon-whitespace.patch
View File

@ -1,25 +0,0 @@
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c (revision 15183)
+++ libnautilus-private/nautilus-icon-container.c (revision 15184)
@@ -1033,9 +1033,9 @@
GtkAllocation *allocation;
gboolean reset_scroll_region;
+ pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+
if (nautilus_icon_container_get_is_fixed_size (container)) {
- pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
-
/* Set the scroll region to the size of the container allocation */
allocation = &GTK_WIDGET (container)->allocation;
eel_canvas_set_scroll_region
@@ -1090,7 +1090,7 @@
if (nautilus_icon_container_is_auto_layout (container)) {
allocation = &GTK_WIDGET (container)->allocation;
x1 = MIN (x1, 0);
- x2 = MAX (x2, allocation->width);
+ x2 = MAX (x2, allocation->width / pixels_per_unit);
y1 = 0;
} else {
/* Otherwise we add the padding that is at the start of the

90
nautilus-gvfs-desktop-key-2.patch
View File

@ -1,6 +1,6 @@
diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/nautilus-autorun-software.desktop.in.in
--- nautilus-2.25.91/nautilus-autorun-software.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/nautilus-autorun-software.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in
--- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=Autorun Prompt
TryExec=nautilus-autorun-software
@ -9,9 +9,9 @@ diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.in.key nautilus-2
Icon=application-x-executable
NoDisplay=true
Terminal=false
diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/nautilus-autorun-software.desktop.in
--- nautilus-2.25.91/nautilus-autorun-software.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-autorun-software.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key nautilus-2.25.91/data/nautilus-autorun-software.desktop.in
--- nautilus-2.25.91/data/nautilus-autorun-software.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-autorun-software.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=Autorun Prompt
TryExec=nautilus-autorun-software
@ -20,9 +20,9 @@ diff -up nautilus-2.25.91/nautilus-autorun-software.desktop.in.key nautilus-2.25
Icon=application-x-executable
NoDisplay=true
Terminal=false
diff -up nautilus-2.25.91/nautilus-browser.desktop.in.in.key nautilus-2.25.91/nautilus-browser.desktop.in.in
--- nautilus-2.25.91/nautilus-browser.desktop.in.in.key 2008-10-02 14:26:49.000000000 +0200
+++ nautilus-2.25.91/nautilus-browser.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in.in
--- nautilus-2.25.91/data/nautilus-browser.desktop.in.in.key 2008-10-02 14:26:49.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-browser.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=File Browser
_Comment=Browse the file system with the file manager
TryExec=nautilus
@ -31,9 +31,9 @@ diff -up nautilus-2.25.91/nautilus-browser.desktop.in.in.key nautilus-2.25.91/na
Icon=system-file-manager
Terminal=false
StartupNotify=true
diff -up nautilus-2.25.91/nautilus-browser.desktop.in.key nautilus-2.25.91/nautilus-browser.desktop.in
--- nautilus-2.25.91/nautilus-browser.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-browser.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-browser.desktop.in.key nautilus-2.25.91/data/nautilus-browser.desktop.in
--- nautilus-2.25.91/data/nautilus-browser.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-browser.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=File Browser
_Comment=Browse the file system with the file manager
TryExec=nautilus
@ -42,9 +42,9 @@ diff -up nautilus-2.25.91/nautilus-browser.desktop.in.key nautilus-2.25.91/nauti
Icon=system-file-manager
Terminal=false
StartupNotify=true
diff -up nautilus-2.25.91/nautilus-computer.desktop.in.in.key nautilus-2.25.91/nautilus-computer.desktop.in.in
--- nautilus-2.25.91/nautilus-computer.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/nautilus-computer.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in.in
--- nautilus-2.25.91/data/nautilus-computer.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-computer.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=Computer
_Comment=Browse all local and remote disks and folders accessible from this computer
TryExec=nautilus
@ -53,9 +53,9 @@ diff -up nautilus-2.25.91/nautilus-computer.desktop.in.in.key nautilus-2.25.91/n
Icon=computer
Terminal=false
StartupNotify=true
diff -up nautilus-2.25.91/nautilus-computer.desktop.in.key nautilus-2.25.91/nautilus-computer.desktop.in
--- nautilus-2.25.91/nautilus-computer.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-computer.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-computer.desktop.in.key nautilus-2.25.91/data/nautilus-computer.desktop.in
--- nautilus-2.25.91/data/nautilus-computer.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-computer.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=Computer
_Comment=Browse all local and remote disks and folders accessible from this computer
TryExec=nautilus
@ -64,9 +64,9 @@ diff -up nautilus-2.25.91/nautilus-computer.desktop.in.key nautilus-2.25.91/naut
Icon=computer
Terminal=false
StartupNotify=true
diff -up nautilus-2.25.91/nautilus.desktop.in.in.key nautilus-2.25.91/nautilus.desktop.in.in
--- nautilus-2.25.91/nautilus.desktop.in.in.key 2009-02-02 13:28:32.000000000 +0100
+++ nautilus-2.25.91/nautilus.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus.desktop.in.in.key nautilus-2.25.91/data/nautilus.desktop.in.in
--- nautilus-2.25.91/data/nautilus.desktop.in.in.key 2009-02-02 13:28:32.000000000 +0100
+++ nautilus-2.25.91/data/nautilus.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -2,6 +2,7 @@
Encoding=UTF-8
_Name=File Manager
@ -75,9 +75,9 @@ diff -up nautilus-2.25.91/nautilus.desktop.in.in.key nautilus-2.25.91/nautilus.d
Icon=system-file-manager
Terminal=false
Type=Application
diff -up nautilus-2.25.91/nautilus.desktop.in.key nautilus-2.25.91/nautilus.desktop.in
--- nautilus-2.25.91/nautilus.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus.desktop.in.key nautilus-2.25.91/data/nautilus.desktop.in
--- nautilus-2.25.91/data/nautilus.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -2,6 +2,7 @@
Encoding=UTF-8
_Name=File Manager
@ -86,9 +86,9 @@ diff -up nautilus-2.25.91/nautilus.desktop.in.key nautilus-2.25.91/nautilus.desk
Icon=system-file-manager
Terminal=false
Type=Application
diff -up nautilus-2.25.91/nautilus.desktop.key nautilus-2.25.91/nautilus.desktop
--- nautilus-2.25.91/nautilus.desktop.key 2009-02-16 14:56:33.000000000 +0100
+++ nautilus-2.25.91/nautilus.desktop 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus.desktop.key nautilus-2.25.91/data/nautilus.desktop
--- nautilus-2.25.91/data/nautilus.desktop.key 2009-02-16 14:56:33.000000000 +0100
+++ nautilus-2.25.91/data/nautilus.desktop 2009-02-16 17:24:49.000000000 +0100
@@ -97,6 +97,7 @@ Name[zh_HK]=檔案管理程式
Name[zh_TW]=檔案管理程式
Name[zu]=Mphathi Hele
@ -97,9 +97,9 @@ diff -up nautilus-2.25.91/nautilus.desktop.key nautilus-2.25.91/nautilus.desktop
Icon=system-file-manager
Terminal=false
Type=Application
diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in
--- nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in
--- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=File Management
_Comment=Change the behaviour and appearance of file manager windows
@ -108,9 +108,9 @@ diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.in.key
Icon=system-file-manager
Terminal=false
Type=Application
diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/nautilus-file-management-properties.desktop.in
--- nautilus-2.25.91/nautilus-file-management-properties.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-file-management-properties.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in
--- nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-file-management-properties.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=File Management
_Comment=Change the behaviour and appearance of file manager windows
@ -119,9 +119,9 @@ diff -up nautilus-2.25.91/nautilus-file-management-properties.desktop.in.key nau
Icon=system-file-manager
Terminal=false
Type=Application
diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/nautilus-folder-handler.desktop.in.in
--- nautilus-2.25.91/nautilus-folder-handler.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/nautilus-folder-handler.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in
--- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=Open Folder
TryExec=nautilus
@ -130,9 +130,9 @@ diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.in.key nautilus-2.2
NoDisplay=true
Terminal=false
Icon=folder-open
diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/nautilus-folder-handler.desktop.in
--- nautilus-2.25.91/nautilus-folder-handler.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-folder-handler.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key nautilus-2.25.91/data/nautilus-folder-handler.desktop.in
--- nautilus-2.25.91/data/nautilus-folder-handler.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-folder-handler.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -3,6 +3,7 @@ Encoding=UTF-8
_Name=Open Folder
TryExec=nautilus
@ -141,9 +141,9 @@ diff -up nautilus-2.25.91/nautilus-folder-handler.desktop.in.key nautilus-2.25.9
NoDisplay=true
Terminal=false
Icon=folder-open
diff -up nautilus-2.25.91/nautilus-home.desktop.in.in.key nautilus-2.25.91/nautilus-home.desktop.in.in
--- nautilus-2.25.91/nautilus-home.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/nautilus-home.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.in.key nautilus-2.25.91/data/nautilus-home.desktop.in.in
--- nautilus-2.25.91/data/nautilus-home.desktop.in.in.key 2008-09-14 14:14:27.000000000 +0200
+++ nautilus-2.25.91/data/nautilus-home.desktop.in.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=Home Folder
_Comment=Open your personal folder
TryExec=nautilus
@ -152,9 +152,9 @@ diff -up nautilus-2.25.91/nautilus-home.desktop.in.in.key nautilus-2.25.91/nauti
Icon=user-home
Terminal=false
StartupNotify=true
diff -up nautilus-2.25.91/nautilus-home.desktop.in.key nautilus-2.25.91/nautilus-home.desktop.in
--- nautilus-2.25.91/nautilus-home.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/nautilus-home.desktop.in 2009-02-16 17:24:49.000000000 +0100
diff -up nautilus-2.25.91/data/nautilus-home.desktop.in.key nautilus-2.25.91/data/nautilus-home.desktop.in
--- nautilus-2.25.91/data/nautilus-home.desktop.in.key 2009-02-16 14:56:30.000000000 +0100
+++ nautilus-2.25.91/data/nautilus-home.desktop.in 2009-02-16 17:24:49.000000000 +0100
@@ -4,6 +4,7 @@ _Name=Home Folder
_Comment=Open your personal folder
TryExec=nautilus

19
nautilus.spec
View File

@ -15,8 +15,8 @@
Name: nautilus
Summary: File manager for GNOME
Version: 2.26.2
Release: 3%{?dist}
Version: 2.27.1
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@ -49,6 +49,7 @@ BuildRequires: fontconfig
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: libtool >= 1.4.2-10
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: startup-notification-devel >= %{startup_notification_version}
BuildRequires: libexif-devel >= %{libexif_version}
BuildRequires: exempi-devel >= %{exempi_version}
@ -72,7 +73,6 @@ Obsoletes: gnome-volume-manager < 2.24.0-2.fc10
# Some changes to default config
Patch1: nautilus-2.5.7-rhconfig.patch
Patch3: background-no-delay.patch
Patch5: nautilus-2.23.5-selinux.patch
@ -87,8 +87,6 @@ Patch10: nautilus-gvfs-desktop-key-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch
# From svn (rev 15184)
Patch18: nautilus-2.26.2-icon-whitespace.patch
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
@ -120,19 +118,21 @@ for developing nautilus extensions.
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .rhconfig
%patch3 -p1 -b .no-delay
%patch5 -p1 -b .selinux
%patch6 -p1 -b .dynamic-search
%patch7 -p1 -b .rtl-fix
# %patch8 -p1 -b .hide-white-screen
%patch10 -p1 -b .gvfs-desktop-key
%patch17 -p0 -b .symlink
%patch18 -p0 -b .whitespace
%build
gtkdocize
autoreconf -i -f
libtoolize
aclocal -I m4
autoconf
autoheader
automake
# -fno-tree-vrp is needed to avoid gcc-4.4.0 optimization failure
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39233
@ -263,6 +263,9 @@ fi
%changelog
* Tue May 5 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.27.1-1
- Update to 2.27.1
* Mon Apr 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-3
- Don't drop schemas translations from po files anymore

2
sources
View File

@ -1 +1 @@
6b9292ed9dde8b5f86a3b6df1422d5f8 nautilus-2.26.2.tar.bz2
77956e50bdb6657a3bb935a595f0c038 nautilus-2.27.1.tar.bz2