[nautilus/f14/master] - Update to 2.31.6
Tomas Bzatek
tbzatek at fedoraproject.org
Thu Aug 12 13:51:16 UTC 2010
commit ce274de4f0876afb36b96552849f9549ea0d8b51
Author: Tomas Bzatek <tbzatek at redhat.com>
Date: Thu Aug 12 15:50:52 2010 +0200
- Update to 2.31.6
.gitignore | 1 +
0001-Update-pkg-config-files-for-GTK-3.x.patch | 37 -
...ld-link-against-gail-3.0-GNOME-bug-622155.patch | 42 -
0013-eel-GSEAL-eel-accessibility.patch | 25 -
0014-eel-GSEAL-eel-alert-dialog.patch | 43 -
0015-eel-GSEAL-eel-art-gtk-extensions.patch | 53 --
0016-eel-GSEAL-eel-background-box.patch | 25 -
0017-eel-GSEAL-eel-background-box.patch | 143 ----
0018-eel-GSEAL-eel-canvas-rect-ellipse.patch | 37 -
0019-eel-GSEAL-eel-canvas.patch | 815 --------------------
0020-eel-GSEAL-eel-debug-drawing.patch | 72 --
0021-eel-GSEAL-eel-editable-label.patch | 578 --------------
0022-eel-GSEAL-eel-gtk-container.patch | 52 --
0023-eel-GSEAL-eel-gtk-extensions.patch | 209 -----
0024-eel-GSEAL-eel-image-table.patch | 25 -
0025-eel-GSEAL-eel-labeled-image.patch | 178 -----
0026-eel-GSEAL-eel-wrap-table.patch | 136 ----
0027-ln-p-GSEAL-nautilus-autorun.patch | 34 -
0028-ln-p-GSEAL-nautilus-bookmark.patch | 25 -
...SEAL-nautilus-cell-renderer-pixbuf-emblem.patch | 117 ---
0030-ln-p-GSEAL-nautilus-clipboard-monitor.patch | 49 --
0031-ln-p-GSEAL-nautilus-clipboard.patch | 40 -
0032-ln-p-GSEAL-nautilus-dnd.patch | 197 -----
0033-ln-p-GSEAL-nautilus-entry.patch | 34 -
...-ln-p-GSEAL-nautilus-file-conflict-dialog.patch | 25 -
0035-ln-p-GSEAL-nautilus-file-operations.patch | 25 -
0036-ln-p-GSEAL-nautilus-horizontal-splitter.patch | 87 ---
0037-ln-p-GSEAL-nautilus-icon-canvas-item.patch | 85 --
0038-ln-p-GSEAL-nautilus-icon-container.patch | 732 ------------------
0039-ln-p-GSEAL-nautilus-icon-dnd.patch | 362 ---------
...n-p-GSEAL-nautilus-keep-last-vertical-box.patch | 33 -
0041-ln-p-GSEAL-nautilus-open-with-dialog.patch | 43 -
0042-ln-p-GSEAL-nautilus-progress-info.patch | 25 -
0043-ln-p-GSEAL-nautilus-tree-view-drag-dest.patch | 199 -----
0044-ln-p-GSEAL-nautilus-undo.patch | 34 -
0045-file-manager-GSEAL-fm-desktop-icon-view.patch | 57 --
0046-file-manager-GSEAL-fm-directory-view.patch | 123 ---
0047-file-manager-GSEAL-fm-ditem-page.patch | 34 -
0048-file-manager-GSEAL-fm-icon-view.patch | 43 -
0049-file-manager-GSEAL-fm-list-model.patch | 25 -
0050-file-manager-GSEAL-fm-list-view.patch | 148 ----
0051-file-manager-GSEAL-fm-properties-window.patch | 285 -------
0052-file-manager-GSEAL-fm-tree-view.patch | 36 -
0053-src-GSEAL-nautilus-application.patch | 58 --
...-src-GSEAL-nautilus-connect-server-dialog.patch | 113 ---
0055-src-GSEAL-nautilus-desktop-window.patch | 37 -
0056-src-GSEAL-nautilus-emblem-sidebar.patch | 133 ----
0057-src-GSEAL-nautilus-information-panel.patch | 90 ---
0058-src-GSEAL-nautilus-location-bar.patch | 67 --
0059-src-GSEAL-nautilus-location-dialog.patch | 34 -
...rc-GSEAL-nautilus-navigation-window-menus.patch | 25 -
0061-src-GSEAL-nautilus-navigation-window.patch | 28 -
0062-src-GSEAL-nautilus-notebook.patch | 58 --
0063-src-GSEAL-nautilus-pathbar.patch | 237 ------
0064-src-GSEAL-nautilus-places-sidebar.patch | 64 --
0065-src-GSEAL-nautilus-property-browser.patch | 138 ----
0066-src-GSEAL-nautilus-query-editor.patch | 25 -
0067-src-GSEAL-nautilus-side-pane.patch | 59 --
0068-src-GSEAL-nautilus-sidebar-title.patch | 88 ---
0069-src-GSEAL-nautilus-spatial-window.patch | 48 --
0070-src-GSEAL-nautilus-window-bookmarks.patch | 25 -
0071-src-GSEAL-nautilus-window-manage-views.patch | 25 -
0072-src-GSEAL-nautilus-window.patch | 29 -
0073-src-GSEAL-nautilus-zoom-control.patch | 112 ---
0074-test-GSEAL-test-eel-image-table.patch | 35 -
nautilus-2.30.1-hide-unmount-when-eject.patch | 92 ---
...-selinux.patch => nautilus-2.31.6-selinux.patch | 167 ++---
nautilus-2.31.x-seal-GtkBoxChild.patch | 107 ---
nautilus-2.31.x-seal1.patch | 489 ------------
nautilus-2.5.7-rhconfig.patch | 11 -
nautilus-578086-po.patch | 47 +--
nautilus-gconf-correct-type.patch | 22 -
nautilus-gconf-default-value.patch | 27 -
...us-gconf-navigation_window_saved_geometry.patch | 34 -
...s-gconf-navigation_window_saved_maximized.patch | 33 -
nautilus.spec | 172 +----
sources | 2 +-
77 files changed, 96 insertions(+), 8003 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e0637a..fcfc2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
nautilus-2.31.5.tar.bz2
+nautilus-2.31.6.tar.bz2
diff --git a/nautilus-2.23.5-selinux.patch b/nautilus-2.31.6-selinux.patch
similarity index 87%
rename from nautilus-2.23.5-selinux.patch
rename to nautilus-2.31.6-selinux.patch
index 51528df..4ab20e1 100644
--- a/nautilus-2.23.5-selinux.patch
+++ b/nautilus-2.31.6-selinux.patch
@@ -1,6 +1,6 @@
-diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c
---- nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux 2009-02-10 18:49:53.000000000 +0100
-+++ nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c 2009-02-16 17:20:33.000000000 +0100
+diff -up nautilus-2.31.6/libnautilus-extension/nautilus-column.c.bak nautilus-2.31.6/libnautilus-extension/nautilus-column.c
+--- nautilus-2.31.6/libnautilus-extension/nautilus-column.c.bak 2009-04-17 15:12:30.000000000 +0200
++++ nautilus-2.31.6/libnautilus-extension/nautilus-column.c 2010-08-12 15:38:31.000000000 +0200
@@ -34,6 +34,7 @@ enum {
PROP_LABEL,
PROP_DESCRIPTION,
@@ -59,9 +59,9 @@ diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux na
+ G_PARAM_READWRITE));
}
-diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h
---- nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux 2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h 2009-02-16 17:20:33.000000000 +0100
+diff -up nautilus-2.31.6/libnautilus-extension/nautilus-column.h.bak nautilus-2.31.6/libnautilus-extension/nautilus-column.h
+--- nautilus-2.31.6/libnautilus-extension/nautilus-column.h.bak 2009-04-17 15:12:30.000000000 +0200
++++ nautilus-2.31.6/libnautilus-extension/nautilus-column.h 2010-08-12 15:38:31.000000000 +0200
@@ -64,6 +64,7 @@ NautilusColumn * nautilus_column_new
* label (string) - the user-visible label for the column
* description (string) - a user-visible description of the column
@@ -70,9 +70,9 @@ diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux na
*/
G_END_DECLS
-diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c
---- nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.selinux 2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c 2009-02-16 17:20:33.000000000 +0100
+diff -up nautilus-2.31.6/libnautilus-private/nautilus-column-utilities.c.bak nautilus-2.31.6/libnautilus-private/nautilus-column-utilities.c
+--- nautilus-2.31.6/libnautilus-private/nautilus-column-utilities.c.bak 2010-08-12 12:20:55.000000000 +0200
++++ nautilus-2.31.6/libnautilus-private/nautilus-column-utilities.c 2010-08-12 15:38:31.000000000 +0200
@@ -119,6 +119,7 @@ get_builtin_columns (void)
"attribute", "selinux_context",
"label", _("SELinux Context"),
@@ -81,10 +81,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.se
NULL));
columns = g_list_append (columns,
g_object_new (NAUTILUS_TYPE_COLUMN,
-diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c
---- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux 2009-02-16 09:45:37.000000000 +0100
-+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c 2009-02-16 17:20:33.000000000 +0100
-@@ -1634,7 +1634,7 @@ update_info_internal (NautilusFile *file
+diff -up nautilus-2.31.6/libnautilus-private/nautilus-file.c.bak nautilus-2.31.6/libnautilus-private/nautilus-file.c
+--- nautilus-2.31.6/libnautilus-private/nautilus-file.c.bak 2010-08-12 15:38:25.000000000 +0200
++++ nautilus-2.31.6/libnautilus-private/nautilus-file.c 2010-08-12 15:38:31.000000000 +0200
+@@ -2181,7 +2181,7 @@ update_info_internal (NautilusFile *file
file->details->is_mountpoint = is_mountpoint;
has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE);
@@ -93,7 +93,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
if (file->details->has_permissions != has_permissions ||
file->details->permissions != permissions) {
changed = TRUE;
-@@ -4393,7 +4393,7 @@ nautilus_file_can_get_selinux_context (N
+@@ -5187,7 +5187,7 @@ nautilus_file_can_get_selinux_context (N
* context
* @file: NautilusFile representing the file in question.
*
@@ -102,7 +102,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
*
**/
char *
-@@ -4426,6 +4426,114 @@ nautilus_file_get_selinux_context (Nauti
+@@ -5220,6 +5220,114 @@ nautilus_file_get_selinux_context (Nauti
return translated;
}
@@ -217,10 +217,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
static char *
get_real_name (const char *name, const char *gecos)
{
-diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h
---- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux 2009-02-02 13:28:32.000000000 +0100
-+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h 2009-02-16 17:20:33.000000000 +0100
-@@ -244,6 +244,7 @@ GList * nautilus_get_all
+diff -up nautilus-2.31.6/libnautilus-private/nautilus-file.h.bak nautilus-2.31.6/libnautilus-private/nautilus-file.h
+--- nautilus-2.31.6/libnautilus-private/nautilus-file.h.bak 2010-08-12 12:20:55.000000000 +0200
++++ nautilus-2.31.6/libnautilus-private/nautilus-file.h 2010-08-12 15:38:31.000000000 +0200
+@@ -250,6 +250,7 @@ GList * nautilus_get_all
GList * nautilus_file_get_settable_group_names (NautilusFile *file);
gboolean nautilus_file_can_get_selinux_context (NautilusFile *file);
char * nautilus_file_get_selinux_context (NautilusFile *file);
@@ -228,7 +228,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautil
/* "Capabilities". */
gboolean nautilus_file_can_read (NautilusFile *file);
-@@ -278,6 +279,10 @@ void nautilus_file_se
+@@ -310,6 +311,10 @@ void nautilus_file_se
guint32 permissions,
NautilusFileOperationCallback callback,
gpointer callback_data);
@@ -239,12 +239,12 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautil
void nautilus_file_rename (NautilusFile *file,
const char *new_name,
NautilusFileOperationCallback callback,
-diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c
---- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.selinux 2009-02-02 13:28:32.000000000 +0100
-+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c 2009-02-16 17:20:33.000000000 +0100
-@@ -67,6 +67,11 @@
- #include "nautilus-trash-monitor.h"
+diff -up nautilus-2.31.6/libnautilus-private/nautilus-file-operations.c.bak nautilus-2.31.6/libnautilus-private/nautilus-file-operations.c
+--- nautilus-2.31.6/libnautilus-private/nautilus-file-operations.c.bak 2010-08-12 12:52:30.000000000 +0200
++++ nautilus-2.31.6/libnautilus-private/nautilus-file-operations.c 2010-08-12 15:38:31.000000000 +0200
+@@ -68,6 +68,11 @@
#include "nautilus-file-utilities.h"
+ #include "nautilus-file-conflict-dialog.h"
+#ifdef HAVE_SELINUX
+ #include <selinux/selinux.h>
@@ -254,7 +254,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
static gboolean confirm_trash_auto_value;
/* TODO: TESTING!!! */
-@@ -140,6 +145,7 @@ typedef struct {
+@@ -152,6 +157,7 @@ typedef struct {
guint32 file_mask;
guint32 dir_permissions;
guint32 dir_mask;
@@ -262,7 +262,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
} SetPermissionsJob;
typedef enum {
-@@ -5141,6 +5147,10 @@ set_permissions_job_done (gpointer user_
+@@ -5408,6 +5414,10 @@ set_permissions_job_done (gpointer user_
job->done_callback (job->done_callback_data);
}
@@ -273,7 +273,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
finalize_common ((CommonJob *)job);
return FALSE;
}
-@@ -5196,6 +5206,14 @@ set_permissions_file (SetPermissionsJob
+@@ -5463,6 +5473,14 @@ set_permissions_file (SetPermissionsJob
current, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
common->cancellable, NULL);
}
@@ -288,7 +288,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
if (!job_aborted (common) &&
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
-@@ -5259,6 +5277,7 @@ nautilus_file_set_permissions_recursive
+@@ -5526,6 +5544,7 @@ nautilus_file_set_permissions_recursive
guint32 file_mask,
guint32 dir_permissions,
guint32 dir_mask,
@@ -296,7 +296,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
NautilusOpCallback callback,
gpointer callback_data)
{
-@@ -5272,7 +5291,24 @@ nautilus_file_set_permissions_recursive
+@@ -5539,7 +5558,24 @@ nautilus_file_set_permissions_recursive
job->dir_mask = dir_mask;
job->done_callback = callback;
job->done_callback_data = callback_data;
@@ -322,10 +322,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
g_io_scheduler_push_job (set_permissions_job,
job,
NULL,
-diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h
---- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.selinux 2008-09-14 14:14:27.000000000 +0200
-+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h 2009-02-16 17:20:33.000000000 +0100
-@@ -85,6 +85,7 @@ void nautilus_file_set_permissions_recur
+diff -up nautilus-2.31.6/libnautilus-private/nautilus-file-operations.h.bak nautilus-2.31.6/libnautilus-private/nautilus-file-operations.h
+--- nautilus-2.31.6/libnautilus-private/nautilus-file-operations.h.bak 2010-08-03 01:35:56.000000000 +0200
++++ nautilus-2.31.6/libnautilus-private/nautilus-file-operations.h 2010-08-12 15:38:31.000000000 +0200
+@@ -87,6 +87,7 @@ void nautilus_file_set_permissions_recur
guint32 file_mask,
guint32 folder_permissions,
guint32 folder_mask,
@@ -333,10 +333,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.sel
NautilusOpCallback callback,
gpointer callback_data);
-diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c
---- nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux 2008-09-14 14:14:22.000000000 +0200
-+++ nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c 2009-02-16 17:20:33.000000000 +0100
-@@ -232,6 +232,31 @@ fm_report_error_setting_permissions (Nau
+diff -up nautilus-2.31.6/src/file-manager/fm-error-reporting.c.bak nautilus-2.31.6/src/file-manager/fm-error-reporting.c
+--- nautilus-2.31.6/src/file-manager/fm-error-reporting.c.bak 2009-04-17 15:12:31.000000000 +0200
++++ nautilus-2.31.6/src/file-manager/fm-error-reporting.c 2010-08-12 15:38:31.000000000 +0200
+@@ -238,6 +238,31 @@ fm_report_error_setting_permissions (Nau
g_free (message);
}
@@ -368,9 +368,9 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux naut
typedef struct _FMRenameData {
char *name;
NautilusFileOperationCallback callback;
-diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h
---- nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux 2008-10-06 12:49:08.000000000 +0200
-+++ nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h 2009-02-16 17:20:33.000000000 +0100
+diff -up nautilus-2.31.6/src/file-manager/fm-error-reporting.h.bak nautilus-2.31.6/src/file-manager/fm-error-reporting.h
+--- nautilus-2.31.6/src/file-manager/fm-error-reporting.h.bak 2009-04-17 15:12:31.000000000 +0200
++++ nautilus-2.31.6/src/file-manager/fm-error-reporting.h 2010-08-12 15:38:31.000000000 +0200
@@ -40,8 +40,11 @@ void fm_report_error_setting_permissions
GError *error,
GtkWindow *parent_window);
@@ -384,10 +384,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux naut
void fm_report_error_setting_group (NautilusFile *file,
GError *error,
GtkWindow *parent_window);
-diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c
---- nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux 2008-12-09 09:45:47.000000000 +0100
-+++ nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c 2009-02-16 17:20:33.000000000 +0100
-@@ -1420,13 +1420,15 @@ create_and_set_up_tree_view (FMListView
+diff -up nautilus-2.31.6/src/file-manager/fm-list-view.c.bak nautilus-2.31.6/src/file-manager/fm-list-view.c
+--- nautilus-2.31.6/src/file-manager/fm-list-view.c.bak 2010-08-12 12:20:55.000000000 +0200
++++ nautilus-2.31.6/src/file-manager/fm-list-view.c 2010-08-12 15:38:31.000000000 +0200
+@@ -1545,13 +1545,15 @@ create_and_set_up_tree_view (FMListView
char *name;
char *label;
float xalign;
@@ -404,7 +404,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2
column_num = fm_list_model_add_column (view->details->model,
nautilus_column);
-@@ -1472,6 +1474,8 @@ create_and_set_up_tree_view (FMListView
+@@ -1596,6 +1598,8 @@ create_and_set_up_tree_view (FMListView
} else {
cell = gtk_cell_renderer_text_new ();
g_object_set (cell, "xalign", xalign, NULL);
@@ -413,10 +413,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2
view->details->cells = g_list_append (view->details->cells,
cell);
column = gtk_tree_view_column_new_with_attributes (label,
-diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c
---- nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux 2009-02-16 09:45:36.000000000 +0100
-+++ nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c 2009-02-16 17:20:33.000000000 +0100
-@@ -83,6 +83,10 @@
+diff -up nautilus-2.31.6/src/file-manager/fm-properties-window.c.bak nautilus-2.31.6/src/file-manager/fm-properties-window.c
+--- nautilus-2.31.6/src/file-manager/fm-properties-window.c.bak 2010-08-12 12:20:55.000000000 +0200
++++ nautilus-2.31.6/src/file-manager/fm-properties-window.c 2010-08-12 15:39:25.000000000 +0200
+@@ -80,6 +80,10 @@
#define FREE_FILL_B (0.811764706 * 65535)
@@ -427,7 +427,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
#define PREVIEW_IMAGE_WIDTH 96
#define ROW_PAD 6
-@@ -125,12 +129,15 @@ struct FMPropertiesWindowDetails {
+@@ -122,12 +126,15 @@ struct FMPropertiesWindowDetails {
unsigned int owner_change_timeout;
GList *permission_buttons;
@@ -444,7 +444,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
GList *mime_list;
gboolean deep_count_finished;
-@@ -217,6 +224,10 @@ static void permission_combo_update
+@@ -214,6 +221,10 @@ static void permission_combo_update
GtkComboBox *combo);
static void value_field_update (FMPropertiesWindow *window,
GtkLabel *field);
@@ -455,7 +455,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static void properties_window_update (FMPropertiesWindow *window,
GList *files);
static void is_directory_ready_callback (NautilusFile *file,
-@@ -246,10 +257,36 @@ static GtkLabel *attach_ellipsizing_valu
+@@ -243,10 +254,36 @@ static GtkLabel *attach_ellipsizing_valu
const char *initial_text);
static GtkWidget* create_pie_widget (FMPropertiesWindow *window);
@@ -492,7 +492,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static gboolean
is_multi_file_window (FMPropertiesWindow *window)
{
-@@ -270,6 +307,111 @@ is_multi_file_window (FMPropertiesWindow
+@@ -267,6 +304,111 @@ is_multi_file_window (FMPropertiesWindow
return FALSE;
}
@@ -604,16 +604,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static int
get_not_gone_original_file_count (FMPropertiesWindow *window)
{
-@@ -502,7 +644,7 @@ fm_properties_window_drag_data_received
- return;
- }
-
-- uris = g_strsplit (selection_data->data, "\r\n", 0);
-+ uris = g_strsplit ((char *) selection_data->data, "\r\n", 0);
- exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0');
-
-
-@@ -651,11 +793,7 @@ set_name_field (FMPropertiesWindow *wind
+@@ -648,11 +790,7 @@ set_name_field (FMPropertiesWindow *wind
* currently showing. This causes minimal ripples (e.g.
* selection change).
*/
@@ -626,7 +617,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
}
}
}
-@@ -735,7 +873,6 @@ static void
+@@ -732,7 +870,6 @@ static void
name_field_restore_original_name (NautilusEntry *name_field)
{
const char *original_name;
@@ -634,7 +625,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
original_name = (const char *) g_object_get_data (G_OBJECT (name_field),
"original_name");
-@@ -744,14 +881,8 @@ name_field_restore_original_name (Nautil
+@@ -741,14 +878,8 @@ name_field_restore_original_name (Nautil
return;
}
@@ -650,7 +641,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
}
static void
-@@ -1213,6 +1344,14 @@ properties_window_update (FMPropertiesWi
+@@ -1210,6 +1341,14 @@ properties_window_update (FMPropertiesWi
for (l = window->details->value_fields; l != NULL; l = l->next) {
value_field_update (window, GTK_LABEL (l->data));
}
@@ -665,7 +656,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
}
mime_list = get_mime_list (window);
-@@ -1383,6 +1522,164 @@ value_field_update (FMPropertiesWindow *
+@@ -1380,6 +1519,164 @@ value_field_update (FMPropertiesWindow *
window->details->target_files));
}
@@ -830,7 +821,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkLabel *
attach_label (GtkTable *table,
int row,
-@@ -1437,6 +1734,47 @@ attach_value_label (GtkTable *table,
+@@ -1434,6 +1731,47 @@ attach_value_label (GtkTable *table,
return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE);
}
@@ -878,7 +869,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkLabel *
attach_ellipsizing_value_label (GtkTable *table,
int row,
-@@ -1495,6 +1833,649 @@ attach_value_field (FMPropertiesWindow *
+@@ -1492,6 +1830,647 @@ attach_value_field (FMPropertiesWindow *
FALSE);
}
@@ -890,9 +881,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
+ GdkCursor * cursor;
+
+ cursor = gdk_cursor_new (GDK_WATCH);
-+ if (GDK_IS_WINDOW (GTK_WIDGET (window)->window)) {
-+ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor);
-+ }
++ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor);
+ gdk_cursor_unref (cursor);
+ }
+ window->details->long_operation_underway ++;
@@ -901,10 +890,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
+static void
+end_long_operation (FMPropertiesWindow *window)
+{
-+ if (GTK_WIDGET (window)->window != NULL &&
++ if (gtk_widget_get_window (GTK_WIDGET (window)) != NULL &&
+ window->details->long_operation_underway == 1) {
+ /* finished !! */
-+ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
++ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), NULL);
+ }
+ window->details->long_operation_underway--;
+}
@@ -1528,7 +1517,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkWidget*
attach_ellipsizing_value_field (FMPropertiesWindow *window,
GtkTable *table,
-@@ -2485,6 +3466,37 @@ append_title_value_pair (FMPropertiesWin
+@@ -2485,6 +3464,37 @@ append_title_value_pair (FMPropertiesWin
return last_row;
}
@@ -1566,7 +1555,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static guint
append_title_and_ellipsizing_value (FMPropertiesWindow *window,
GtkTable *table,
-@@ -3504,31 +4516,6 @@ create_emblems_page (FMPropertiesWindow
+@@ -3511,31 +4521,6 @@ create_emblems_page (FMPropertiesWindow
}
static void
@@ -1577,7 +1566,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
- GdkCursor * cursor;
-
- cursor = gdk_cursor_new (GDK_WATCH);
-- gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor);
+- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor);
- gdk_cursor_unref (cursor);
- }
- window->details->long_operation_underway ++;
@@ -1586,10 +1575,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
-static void
-end_long_operation (FMPropertiesWindow *window)
-{
-- if (GTK_WIDGET (window)->window != NULL &&
+- if (gtk_widget_get_window (GTK_WIDGET (window)) != NULL &&
- window->details->long_operation_underway == 1) {
- /* finished !! */
-- gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
+- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), NULL);
- }
- window->details->long_operation_underway--;
-}
@@ -1598,8 +1587,8 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
permission_change_callback (NautilusFile *file,
GFile *res_loc,
GError *error,
-@@ -4304,39 +5291,6 @@ append_special_execution_flags (FMProper
- gtk_table_set_row_spacing (table, table->nrows - 1, 18);
+@@ -4318,39 +5303,6 @@ append_special_execution_flags (FMProper
+ gtk_table_set_row_spacing (table, nrows - 1, 18);
}
-static gboolean
@@ -1638,7 +1627,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GHashTable *
get_initial_permissions (GList *file_list)
-@@ -4676,7 +5630,9 @@ apply_recursive_clicked (GtkWidget *recu
+@@ -4698,7 +5650,9 @@ apply_recursive_clicked (GtkWidget *recu
guint32 file_permission, file_permission_mask;
guint32 dir_permission, dir_permission_mask;
guint32 vfs_mask, vfs_new_perm, p;
@@ -1649,7 +1638,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
gboolean active, is_folder, is_special, use_original;
GList *l;
GtkTreeModel *model;
-@@ -4720,9 +5676,9 @@ apply_recursive_clicked (GtkWidget *recu
+@@ -4742,9 +5696,9 @@ apply_recursive_clicked (GtkWidget *recu
}
/* Simple mode, minus exec checkbox */
for (l = window->details->permission_combos; l != NULL; l = l->next) {
@@ -1661,7 +1650,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
continue;
}
-@@ -4730,7 +5686,7 @@ apply_recursive_clicked (GtkWidget *recu
+@@ -4752,7 +5706,7 @@ apply_recursive_clicked (GtkWidget *recu
is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo),
"is-folder"));
@@ -1670,7 +1659,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
gtk_tree_model_get (model, &iter, 1, &new_perm, 2, &use_original, -1);
if (use_original) {
continue;
-@@ -4753,12 +5709,53 @@ apply_recursive_clicked (GtkWidget *recu
+@@ -4775,12 +5729,53 @@ apply_recursive_clicked (GtkWidget *recu
}
}
@@ -1724,7 +1713,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
if (nautilus_file_is_directory (file) &&
nautilus_file_can_set_permissions (file)) {
uri = nautilus_file_get_uri (file);
-@@ -4769,11 +5766,13 @@ apply_recursive_clicked (GtkWidget *recu
+@@ -4791,11 +5786,13 @@ apply_recursive_clicked (GtkWidget *recu
file_permission_mask,
dir_permission,
dir_permission_mask,
@@ -1738,8 +1727,8 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
}
static void
-@@ -4822,10 +5821,16 @@ create_permissions_page (FMPropertiesWin
- gtk_table_set_row_spacing (page_table, page_table->nrows - 1, 18);
+@@ -4846,10 +5843,16 @@ create_permissions_page (FMPropertiesWin
+ gtk_table_set_row_spacing (page_table, nrows - 1, 18);
#ifdef HAVE_SELINUX
- append_title_value_pair
diff --git a/nautilus-578086-po.patch b/nautilus-578086-po.patch
index c050d25..166ce47 100644
--- a/nautilus-578086-po.patch
+++ b/nautilus-578086-po.patch
@@ -21,49 +21,4 @@ index 353931f..d7c5618 100644
#: ../libnautilus-private/nautilus-file-operations.c:2876
msgid "Duplicating %'d file (in \"%B\")"
-diff --git a/po/bn_IN.po b/po/bn_IN.po
-index 51bb767..a7a330c 100644
---- a/po/bn_IN.po
-+++ b/po/bn_IN.po
-@@ -2286,14 +2286,14 @@ msgstr "\"%B\"-র প্রতিলিপি তৈরি করা হচ্
- #: ../libnautilus-private/nautilus-file-operations.c:2890
- msgid "Moving %'d file (in \"%B\") to \"%B\""
- msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
--msgstr[0] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে"
--msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে"
-+msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে"
-+msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে"
-
- #: ../libnautilus-private/nautilus-file-operations.c:2894
- msgid "Copying %'d file (in \"%B\") to \"%B\""
- msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
--msgstr[0] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে"
--msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে"
-+msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে"
-+msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে"
-
- #: ../libnautilus-private/nautilus-file-operations.c:2902
- msgid "Duplicating %'d file (in \"%B\")"
-diff --git a/po/gu.po b/po/gu.po
-index 0dd7313..24d916a 100644
---- a/po/gu.po
-+++ b/po/gu.po
-@@ -2240,14 +2240,14 @@ msgstr "\"%B\" ની નકલ કરી રહ્યા છીએ"
- #: ../libnautilus-private/nautilus-file-operations.c:2890
- msgid "Moving %'d file (in \"%B\") to \"%B\""
- msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
--msgstr[0] "\"%B\" માં %'d ફાઇલોને ખસેડી રહ્યા છે (\"%B\" માં)"
--msgstr[1] "\"%B\" માં %'d ને ખસેડી રહ્યા છે (\"%B\" માં)"
-+msgstr[0] "\"%3$B\" માં %1$'d ફાઇલોને ખસેડી રહ્યા છે (\"%2$B\" માં)"
-+msgstr[1] "\"%3$B\" માં %1$'d ને ખસેડી રહ્યા છે (\"%2$B\" માં)"
-
- #: ../libnautilus-private/nautilus-file-operations.c:2894
- msgid "Copying %'d file (in \"%B\") to \"%B\""
- msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
--msgstr[0] "\"%B\" માં %'d ફાઇલની નકલ કરી રહ્યા છે"
--msgstr[1] "\"%B\" માં %'d ફાઇલોની નકલ કરી રહ્યા છે"
-+msgstr[0] "\"%3$B\" માં %1$'d ફાઇલની નકલ કરી રહ્યા છે (\"%2$B\")"
-+msgstr[1] "\"%3$B\" માં %1$'d ફાઇલોની નકલ કરી રહ્યા છે (\"%2$B\")"
-
- #: ../libnautilus-private/nautilus-file-operations.c:2902
- msgid "Duplicating %'d file (in \"%B\")"
+
diff --git a/nautilus.spec b/nautilus.spec
index 874233d..bc0776a 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -1,6 +1,6 @@
-%define glib2_version 2.24.0
+%define glib2_version 2.25.9
%define pango_version 1.1.3
-%define gtk2_version 2.20.0
+%define gtk2_version 2.21.2
%define gnome_icon_theme_version 1.1.5
%define libxml2_version 2.4.20
%define desktop_file_utils_version 0.7
@@ -11,16 +11,15 @@
%define gconf_version 2.14
%define exempi_version 1.99.5
%define unique_version 1.0.4
-
-%define fake_version 2.30.1
+%define gobject_introspection_version 0.6.4
Name: nautilus
-Summary: File manager for GNOME
-Version: 2.31.5
-Release: 3.really.2.30.1%{?dist}
+Summary: File manager for GNOME
+Version: 2.31.6
+Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
-Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{fake_version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
URL: http://projects.gnome.org/nautilus/
Requires: gamin
@@ -56,6 +55,7 @@ BuildRequires: libselinux-devel
BuildRequires: unique-devel >= %{unique_version}
BuildRequires: gtk-doc
BuildRequires: scrollkeeper
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
@@ -79,7 +79,7 @@ Provides: eel2 = 2.26.0-3
# Some changes to default config
Patch1: nautilus-config.patch
-Patch4: nautilus-2.23.5-selinux.patch
+Patch4: nautilus-2.31.6-selinux.patch
Patch7: rtl-fix.patch
#Patch8: nautilus-2.22.1-hide-white-screen.patch
@@ -89,86 +89,11 @@ Patch10: nautilus-gvfs-desktop-key-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch
-# from upstream
-Patch18: nautilus-2.30.1-hide-unmount-when-eject.patch
-Patch19: nautilus-gconf-navigation_window_saved_geometry.patch
-Patch20: nautilus-gconf-navigation_window_saved_maximized.patch
-Patch21: nautilus-gconf-correct-type.patch
-Patch22: nautilus-gconf-default-value.patch
-
# [bn_IN, gu_IN][nautilus] - Its crashing, when drag any file
# https://bugzilla.redhat.com/show_bug.cgi?id=583559
Patch23: nautilus-578086-po.patch
-
-Patch98: nautilus-2.31.x-seal-GtkBoxChild.patch
-Patch99: nautilus-2.31.x-seal1.patch
-
-Patch100: 0013-eel-GSEAL-eel-accessibility.patch
-Patch101: 0014-eel-GSEAL-eel-alert-dialog.patch
-Patch102: 0015-eel-GSEAL-eel-art-gtk-extensions.patch
-Patch103: 0016-eel-GSEAL-eel-background-box.patch
-Patch104: 0017-eel-GSEAL-eel-background-box.patch
-Patch105: 0018-eel-GSEAL-eel-canvas-rect-ellipse.patch
-Patch106: 0019-eel-GSEAL-eel-canvas.patch
-Patch107: 0020-eel-GSEAL-eel-debug-drawing.patch
-Patch108: 0021-eel-GSEAL-eel-editable-label.patch
-Patch109: 0022-eel-GSEAL-eel-gtk-container.patch
-Patch110: 0023-eel-GSEAL-eel-gtk-extensions.patch
-Patch111: 0024-eel-GSEAL-eel-image-table.patch
-Patch112: 0025-eel-GSEAL-eel-labeled-image.patch
-Patch113: 0026-eel-GSEAL-eel-wrap-table.patch
-Patch114: 0027-ln-p-GSEAL-nautilus-autorun.patch
-Patch115: 0028-ln-p-GSEAL-nautilus-bookmark.patch
-Patch116: 0029-ln-p-GSEAL-nautilus-cell-renderer-pixbuf-emblem.patch
-Patch117: 0030-ln-p-GSEAL-nautilus-clipboard-monitor.patch
-Patch118: 0031-ln-p-GSEAL-nautilus-clipboard.patch
-Patch119: 0032-ln-p-GSEAL-nautilus-dnd.patch
-Patch120: 0033-ln-p-GSEAL-nautilus-entry.patch
-Patch121: 0034-ln-p-GSEAL-nautilus-file-conflict-dialog.patch
-Patch122: 0035-ln-p-GSEAL-nautilus-file-operations.patch
-Patch123: 0036-ln-p-GSEAL-nautilus-horizontal-splitter.patch
-Patch124: 0037-ln-p-GSEAL-nautilus-icon-canvas-item.patch
-Patch125: 0038-ln-p-GSEAL-nautilus-icon-container.patch
-Patch126: 0039-ln-p-GSEAL-nautilus-icon-dnd.patch
-Patch127: 0040-ln-p-GSEAL-nautilus-keep-last-vertical-box.patch
-Patch128: 0041-ln-p-GSEAL-nautilus-open-with-dialog.patch
-Patch129: 0042-ln-p-GSEAL-nautilus-progress-info.patch
-Patch130: 0043-ln-p-GSEAL-nautilus-tree-view-drag-dest.patch
-Patch131: 0044-ln-p-GSEAL-nautilus-undo.patch
-Patch132: 0045-file-manager-GSEAL-fm-desktop-icon-view.patch
-Patch133: 0046-file-manager-GSEAL-fm-directory-view.patch
-Patch134: 0047-file-manager-GSEAL-fm-ditem-page.patch
-Patch135: 0048-file-manager-GSEAL-fm-icon-view.patch
-Patch136: 0049-file-manager-GSEAL-fm-list-model.patch
-Patch137: 0050-file-manager-GSEAL-fm-list-view.patch
-Patch138: 0051-file-manager-GSEAL-fm-properties-window.patch
-Patch139: 0052-file-manager-GSEAL-fm-tree-view.patch
-Patch140: 0053-src-GSEAL-nautilus-application.patch
-Patch141: 0054-src-GSEAL-nautilus-connect-server-dialog.patch
-Patch142: 0055-src-GSEAL-nautilus-desktop-window.patch
-Patch143: 0056-src-GSEAL-nautilus-emblem-sidebar.patch
-Patch144: 0057-src-GSEAL-nautilus-information-panel.patch
-Patch145: 0058-src-GSEAL-nautilus-location-bar.patch
-Patch146: 0059-src-GSEAL-nautilus-location-dialog.patch
-Patch147: 0060-src-GSEAL-nautilus-navigation-window-menus.patch
-Patch148: 0061-src-GSEAL-nautilus-navigation-window.patch
-Patch149: 0062-src-GSEAL-nautilus-notebook.patch
-Patch150: 0063-src-GSEAL-nautilus-pathbar.patch
-Patch151: 0064-src-GSEAL-nautilus-places-sidebar.patch
-Patch152: 0065-src-GSEAL-nautilus-property-browser.patch
-Patch153: 0066-src-GSEAL-nautilus-query-editor.patch
-Patch154: 0067-src-GSEAL-nautilus-side-pane.patch
-Patch155: 0068-src-GSEAL-nautilus-sidebar-title.patch
-Patch156: 0069-src-GSEAL-nautilus-spatial-window.patch
-Patch157: 0070-src-GSEAL-nautilus-window-bookmarks.patch
-Patch158: 0071-src-GSEAL-nautilus-window-manage-views.patch
-Patch159: 0072-src-GSEAL-nautilus-window.patch
-Patch160: 0073-src-GSEAL-nautilus-zoom-control.patch
-Patch161: 0074-test-GSEAL-test-eel-image-table.patch
-
-
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
that makes it easy to manage your files and the rest of your system.
@@ -199,7 +124,7 @@ This package provides libraries and header files needed
for developing nautilus extensions.
%prep
-%setup -q -n %{name}-%{fake_version}
+%setup -q -n %{name}-%{version}
%patch1 -p1 -b .config
%patch4 -p1 -b .selinux
@@ -207,80 +132,8 @@ for developing nautilus extensions.
# %patch8 -p1 -b .hide-white-screen
%patch10 -p1 -b .gvfs-desktop-key
%patch17 -p0 -b .symlink
-%patch18 -p1 -b .hide-unmount
-%patch19 -p1 -b .saved-geometry
-%patch20 -p1 -b .saved-maximized
-%patch21 -p1 -b .gconf-type
-%patch22 -p1 -b .gconf-default
%patch23 -p1 -b .gu_IN-crash
-# seal
-%patch98 -p1 -b .seal-GtkBoxChild
-%patch99 -p1 -b .seal1
-%patch100 -p1 -b .0013-eel-GSEAL-eel-accessibility
-%patch101 -p1 -b .0014-eel-GSEAL-eel-alert-dialog
-%patch102 -p1 -b .0015-eel-GSEAL-eel-art-gtk-extensions
-%patch103 -p1 -b .0016-eel-GSEAL-eel-background-box
-%patch104 -p1 -b .0017-eel-GSEAL-eel-background-box
-%patch105 -p1 -b .0018-eel-GSEAL-eel-canvas-rect-ellipse
-%patch106 -p1 -b .0019-eel-GSEAL-eel-canvas
-%patch107 -p1 -b .0020-eel-GSEAL-eel-debug-drawing
-%patch108 -p1 -b .0021-eel-GSEAL-eel-editable-label
-%patch109 -p1 -b .0022-eel-GSEAL-eel-gtk-container
-%patch110 -p1 -b .0023-eel-GSEAL-eel-gtk-extensions
-%patch111 -p1 -b .0024-eel-GSEAL-eel-image-table
-%patch112 -p1 -b .0025-eel-GSEAL-eel-labeled-image
-%patch113 -p1 -b .0026-eel-GSEAL-eel-wrap-table
-%patch114 -p1 -b .0027-ln-p-GSEAL-nautilus-autorun
-%patch115 -p1 -b .0028-ln-p-GSEAL-nautilus-bookmark
-%patch116 -p1 -b .0029-ln-p-GSEAL-nautilus-cell-renderer-pixbuf-emblem
-# %patch117 -p1 -b .0030-ln-p-GSEAL-nautilus-clipboard-monitor
-%patch118 -p1 -b .0031-ln-p-GSEAL-nautilus-clipboard
-%patch119 -p1 -b .0032-ln-p-GSEAL-nautilus-dnd
-%patch120 -p1 -b .0033-ln-p-GSEAL-nautilus-entry
-# %patch121 -p1 -b .0034-ln-p-GSEAL-nautilus-file-conflict-dialog
-%patch122 -p1 -b .0035-ln-p-GSEAL-nautilus-file-operations
-%patch123 -p1 -b .0036-ln-p-GSEAL-nautilus-horizontal-splitter
-%patch124 -p1 -b .0037-ln-p-GSEAL-nautilus-icon-canvas-item
-%patch125 -p1 -b .0038-ln-p-GSEAL-nautilus-icon-container
-%patch126 -p1 -b .0039-ln-p-GSEAL-nautilus-icon-dnd
-%patch127 -p1 -b .0040-ln-p-GSEAL-nautilus-keep-last-vertical-box
-%patch128 -p1 -b .0041-ln-p-GSEAL-nautilus-open-with-dialog
-%patch129 -p1 -b .0042-ln-p-GSEAL-nautilus-progress-info
-%patch130 -p1 -b .0043-ln-p-GSEAL-nautilus-tree-view-drag-dest
-%patch131 -p1 -b .0044-ln-p-GSEAL-nautilus-undo
-%patch132 -p1 -b .0045-file-manager-GSEAL-fm-desktop-icon-view
-# %patch133 -p1 -b .0046-file-manager-GSEAL-fm-directory-view
-%patch134 -p1 -b .0047-file-manager-GSEAL-fm-ditem-page
-%patch135 -p1 -b .0048-file-manager-GSEAL-fm-icon-view
-%patch136 -p1 -b .0049-file-manager-GSEAL-fm-list-model
-%patch137 -p1 -b .0050-file-manager-GSEAL-fm-list-view
-# %patch138 -p1 -b .0051-file-manager-GSEAL-fm-properties-window
-%patch139 -p1 -b .0052-file-manager-GSEAL-fm-tree-view
-%patch140 -p1 -b .0053-src-GSEAL-nautilus-application
-%patch141 -p1 -b .0054-src-GSEAL-nautilus-connect-server-dialog
-%patch142 -p1 -b .0055-src-GSEAL-nautilus-desktop-window
-%patch143 -p1 -b .0056-src-GSEAL-nautilus-emblem-sidebar
-# %patch144 -p1 -b .0057-src-GSEAL-nautilus-information-panel
-%patch145 -p1 -b .0058-src-GSEAL-nautilus-location-bar
-%patch146 -p1 -b .0059-src-GSEAL-nautilus-location-dialog
-%patch147 -p1 -b .0060-src-GSEAL-nautilus-navigation-window-menus
-%patch148 -p1 -b .0061-src-GSEAL-nautilus-navigation-window
-%patch149 -p1 -b .0062-src-GSEAL-nautilus-notebook
-%patch150 -p1 -b .0063-src-GSEAL-nautilus-pathbar
-%patch151 -p1 -b .0064-src-GSEAL-nautilus-places-sidebar
-%patch152 -p1 -b .0065-src-GSEAL-nautilus-property-browser
-%patch153 -p1 -b .0066-src-GSEAL-nautilus-query-editor
-%patch154 -p1 -b .0067-src-GSEAL-nautilus-side-pane
-%patch155 -p1 -b .0068-src-GSEAL-nautilus-sidebar-title
-%patch156 -p1 -b .0069-src-GSEAL-nautilus-spatial-window
-%patch157 -p1 -b .0070-src-GSEAL-nautilus-window-bookmarks
-%patch158 -p1 -b .0071-src-GSEAL-nautilus-window-manage-views
-%patch159 -p1 -b .0072-src-GSEAL-nautilus-window
-%patch160 -p1 -b .0073-src-GSEAL-nautilus-zoom-control
-%patch161 -p1 -b .0074-test-GSEAL-test-eel-image-table
-
-
%build
@@ -400,6 +253,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%files extensions
%defattr(-, root, root)
%{_libdir}/libnautilus-extension.so.*
+%{_libdir}/girepository-1.0/*.typelib
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-2.0
@@ -408,10 +262,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_includedir}/nautilus
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
+%{_datadir}/gir-1.0/*.gir
%doc %{_datadir}/gtk-doc/html/libnautilus-extension/*
%changelog
+* Thu Aug 12 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.6-1
+- Update to 2.31.6
+
* Fri Aug 6 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.31.5-3.really.2.30.1
- Revert back (temporarily) to 2.30.1 and mask it as 2.31.5 due to recent gnome3 changes
diff --git a/sources b/sources
index 301339f..9ee752a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1bda55f9c6cd223561da066dbc4e863 nautilus-2.30.1.tar.bz2
+bcae941993278b23f8697e7f9125f63b nautilus-2.31.6.tar.bz2
More information about the scm-commits
mailing list