From 33eb3bb34ff456ec889dee065fd8e581b291d2593230ee73fff4c62840f36f49 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 24 Jun 2008 02:35:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=22 --- ...187126_file-roller-batch-extract-all.patch | 24 +- file-roller-2.12.2-no-cmdline-overflow.patch | 470 ------------------ file-roller-2.22.2.tar.bz2 | 3 - file-roller-2.23.3.tar.bz2 | 3 + file-roller.changes | 45 ++ file-roller.spec | 53 +- 6 files changed, 106 insertions(+), 492 deletions(-) delete mode 100644 file-roller-2.12.2-no-cmdline-overflow.patch delete mode 100644 file-roller-2.22.2.tar.bz2 create mode 100644 file-roller-2.23.3.tar.bz2 diff --git a/bug-187126_file-roller-batch-extract-all.patch b/bug-187126_file-roller-batch-extract-all.patch index 1895228..906c7ce 100644 --- a/bug-187126_file-roller-batch-extract-all.patch +++ b/bug-187126_file-roller-batch-extract-all.patch @@ -14,19 +14,19 @@ Original bug: https://launchpad.net/distros/ubuntu/+source/file-roller/+bug/4089 * src/window.c (window_archive__open_extract): tell window_fake_load that we are batch extracting all -Index: file-roller-2.19.2/src/fr-window.c +Index: file-roller-2.23.3/src/fr-window.c =================================================================== ---- file-roller-2.19.2.orig/src/fr-window.c -+++ file-roller-2.19.2/src/fr-window.c -@@ -309,6 +309,7 @@ struct _FrWindowPrivateData { - gboolean extract_interact_use_default_dir; - gboolean update_dropped_files; - gboolean batch_adding_one_file; +--- file-roller-2.23.3.orig/src/fr-window.c ++++ file-roller-2.23.3/src/fr-window.c +@@ -389,6 +389,7 @@ struct _FrWindowPrivateData { + gboolean extract_interact_use_default_dir; + gboolean update_dropped_files; + gboolean batch_adding_one_file; + gboolean batch_extracting_all; - GtkWindow *load_error_parent_window; - }; -@@ -3762,7 +3763,7 @@ fr_window_fake_load (FrArchive *archive, + GtkWindow *load_error_parent_window; + gboolean showing_error_dialog; +@@ -4952,7 +4953,7 @@ fr_window_fake_load (FrArchive *archive, return (window->priv->batch_mode && ! (add_after_opening && window->priv->update_dropped_files && ! archive->command->propAddCanUpdate) && ! (add_after_opening && ! window->priv->update_dropped_files && ! archive->command->propAddCanReplace) @@ -35,7 +35,7 @@ Index: file-roller-2.19.2/src/fr-window.c } -@@ -4120,6 +4121,7 @@ fr_window_construct (FrWindow *window) +@@ -5369,6 +5370,7 @@ fr_window_construct (FrWindow *window) window->priv->stoppable = TRUE; window->priv->batch_adding_one_file = FALSE; @@ -43,7 +43,7 @@ Index: file-roller-2.19.2/src/fr-window.c window->priv->path_clicked = NULL; -@@ -7038,6 +7040,7 @@ fr_window_new_batch (FrWindow *window) +@@ -8406,6 +8408,7 @@ fr_window_new_batch (FrWindow *window) { fr_window_free_batch_data (window); window->priv->non_interactive = TRUE; diff --git a/file-roller-2.12.2-no-cmdline-overflow.patch b/file-roller-2.12.2-no-cmdline-overflow.patch deleted file mode 100644 index d2f61c8..0000000 --- a/file-roller-2.12.2-no-cmdline-overflow.patch +++ /dev/null @@ -1,470 +0,0 @@ -Index: file-roller-2.19.4/src/fr-archive.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-archive.c -+++ file-roller-2.19.4/src/fr-archive.c -@@ -2705,7 +2705,7 @@ move_files_to_dir (FrArchive *archive, - else - sprintf (path, "%s/%s", source_dir, e_filename); - -- fr_process_add_arg (archive->process, path); -+ fr_process_add_file_arg (archive->process, path); - - g_free (e_filename); - } -Index: file-roller-2.19.4/src/fr-command-ar.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-ar.c -+++ file-roller-2.19.4/src/fr-command-ar.c -@@ -226,7 +226,7 @@ fr_command_ar_add (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, (gchar*) scan->data); -+ fr_process_add_file_arg (comm->process, (gchar*) scan->data); - - fr_process_end_command (comm->process); - } -@@ -244,7 +244,7 @@ fr_command_ar_delete (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -269,7 +269,7 @@ fr_command_ar_extract (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - fr_process_end_command (comm->process); - } -Index: file-roller-2.19.4/src/fr-command-arj.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-arj.c -+++ file-roller-2.19.4/src/fr-command-arj.c -@@ -219,7 +219,7 @@ fr_command_arj_add (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, (gchar*) scan->data); -+ fr_process_add_file_arg (comm->process, (gchar*) scan->data); - - fr_process_end_command (comm->process); - } -@@ -241,7 +241,7 @@ fr_command_arj_delete (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -292,7 +292,7 @@ fr_command_arj_extract (FrCommand *comm - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - fr_process_end_command (comm->process); - } -Index: file-roller-2.19.4/src/fr-command-lha.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-lha.c -+++ file-roller-2.19.4/src/fr-command-lha.c -@@ -244,7 +244,7 @@ fr_command_lha_add (FrCommand *comm, - fr_process_add_arg (comm->process, "a"); - fr_process_add_arg (comm->process, comm->e_filename); - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, (gchar*) scan->data); -+ fr_process_add_file_arg (comm->process, (gchar*) scan->data); - fr_process_end_command (comm->process); - } - -@@ -260,7 +260,7 @@ fr_command_lha_delete (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -298,7 +298,7 @@ fr_command_lha_extract (FrCommand *comm - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - fr_process_end_command (comm->process); - } -Index: file-roller-2.19.4/src/fr-command-rar.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-rar.c -+++ file-roller-2.19.4/src/fr-command-rar.c -@@ -265,7 +265,7 @@ fr_command_rar_add (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, (gchar*) scan->data); -+ fr_process_add_file_arg (comm->process, (gchar*) scan->data); - - fr_process_end_command (comm->process); - } -@@ -286,7 +286,7 @@ fr_command_rar_delete (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -331,7 +331,7 @@ fr_command_rar_extract (FrCommand *comm - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - if (dest_dir != NULL) { - char *e_dest_dir = fr_command_escape (comm, dest_dir); -Index: file-roller-2.19.4/src/fr-command-rpm.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-rpm.c -+++ file-roller-2.19.4/src/fr-command-rpm.c -@@ -179,7 +179,7 @@ fr_command_rpm_extract (FrCommand *comm - fr_process_add_arg (comm->process, "| cpio -idu"); - for (scan = file_list; scan; scan = scan->next) { - char *filename = (char*) scan->data; -- fr_process_add_arg (comm->process, filename); -+ fr_process_add_file_arg (comm->process, filename); - } - fr_process_end_command (comm->process); - fr_process_start (comm->process); -Index: file-roller-2.19.4/src/fr-command-tar.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-tar.c -+++ file-roller-2.19.4/src/fr-command-tar.c -@@ -329,7 +329,7 @@ fr_command_tar_add (FrCommand *comm, - fr_process_add_arg (comm->process, c_tar->uncomp_filename); - fr_process_add_arg (comm->process, "--"); - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -373,7 +373,7 @@ fr_command_tar_delete (FrCommand *comm, - - fr_process_add_arg (comm->process, "--"); - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -420,7 +420,7 @@ fr_command_tar_extract (FrCommand *comm - - fr_process_add_arg (comm->process, "--"); - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - fr_process_end_command (comm->process); - } -Index: file-roller-2.19.4/src/fr-command-unstuff.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-unstuff.c -+++ file-roller-2.19.4/src/fr-command-unstuff.c -@@ -249,7 +249,7 @@ fr_command_unstuff_extract (FrCommand * - /* FIXME it is not possible to unpack only some files */ - #if 0 - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - #endif - - fr_process_end_command (comm->process); -Index: file-roller-2.19.4/src/fr-command-zip.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-zip.c -+++ file-roller-2.19.4/src/fr-command-zip.c -@@ -319,7 +319,7 @@ fr_command_zip_add (FrCommand *comm, - - for (scan = file_list; scan; scan = scan->next) { - char *temp = prepend_path_separator ((char*) scan->data); -- fr_process_add_arg (comm->process, temp); -+ fr_process_add_file_arg (comm->process, temp); - g_free (temp); - } - -@@ -343,7 +343,7 @@ fr_command_zip_delete (FrCommand *comm, - - for (scan = file_list; scan; scan = scan->next) { - char *temp = prepend_path_separator_zip_escape ((char*) scan->data); -- fr_process_add_arg (comm->process, temp); -+ fr_process_add_file_arg (comm->process, temp); - g_free (temp); - } - -@@ -392,7 +392,7 @@ fr_command_zip_extract (FrCommand *comm - - for (scan = file_list; scan; scan = scan->next) { - char *temp = prepend_path_separator_zip_escape ((char*) scan->data); -- fr_process_add_arg (comm->process, temp); -+ fr_process_add_file_arg (comm->process, temp); - g_free (temp); - } - -Index: file-roller-2.19.4/src/fr-command-zoo.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-command-zoo.c -+++ file-roller-2.19.4/src/fr-command-zoo.c -@@ -259,7 +259,7 @@ fr_command_zoo_add (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -277,7 +277,7 @@ fr_command_zoo_delete (FrCommand *comm, - fr_process_add_arg (comm->process, comm->e_filename); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - fr_process_end_command (comm->process); - } - -@@ -306,7 +306,7 @@ fr_command_zoo_extract (FrCommand *comm - fr_process_set_working_dir (comm->process, dest_dir); - - for (scan = file_list; scan; scan = scan->next) -- fr_process_add_arg (comm->process, scan->data); -+ fr_process_add_file_arg (comm->process, scan->data); - - fr_process_end_command (comm->process); - } -Index: file-roller-2.19.4/src/fr-process.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-process.c -+++ file-roller-2.19.4/src/fr-process.c -@@ -43,6 +43,11 @@ enum { - LAST_SIGNAL - }; - -+/* Shell limit minus a bit for fixed arguments */ -+#define FILES_LIST_LENGTH_MAX 30000 -+ -+static const gchar file_list_insertion_point [] = "{}"; -+ - static GObjectClass *parent_class; - static guint fr_process_signals[LAST_SIGNAL] = { 0 }; - -@@ -67,17 +72,37 @@ fr_command_info_new (void) - - - static void -+free_if_not_insertion_point (gpointer p) -+{ -+ if (p != file_list_insertion_point) -+ g_free (p); -+} -+ -+ -+static void - fr_command_info_free (FRCommandInfo * c_info) - { - if (c_info == NULL) - return; - - if (c_info->args != NULL) { -- g_list_foreach (c_info->args, (GFunc) g_free, NULL); -+ g_list_foreach (c_info->args, (GFunc) free_if_not_insertion_point, NULL); - g_list_free (c_info->args); - c_info->args = NULL; - } - -+ if (c_info->files != NULL) { -+ g_list_foreach (c_info->files, (GFunc) g_free, NULL); -+ g_list_free (c_info->files); -+ c_info->files = NULL; -+ } -+ -+ if (c_info->files_next != NULL) { -+ g_list_foreach (c_info->files_next, (GFunc) g_free, NULL); -+ g_list_free (c_info->files_next); -+ c_info->files_next = NULL; -+ } -+ - if (c_info->dir != NULL) { - g_free (c_info->dir); - c_info->dir = NULL; -@@ -338,6 +363,23 @@ fr_process_add_arg (FrProcess *fr_proc, - c_info->args = g_list_prepend (c_info->args, g_strdup (arg)); - } - -+void -+fr_process_add_file_arg (FrProcess *fr_proc, -+ const char *arg) -+{ -+ FRCommandInfo *c_info; -+ -+ g_return_if_fail (fr_proc != NULL); -+ -+ c_info = g_ptr_array_index (fr_proc->comm, fr_proc->current_comm); -+ c_info->files_next = g_list_prepend (c_info->files_next, g_strdup (arg)); -+ -+ /* Insertion point for file list */ -+ if (!c_info->args || !c_info->args->data || -+ c_info->args->data != file_list_insertion_point) { -+ c_info->args = g_list_prepend (c_info->args, (gpointer) file_list_insertion_point); -+ } -+} - - void - fr_process_set_arg_at (FrProcess *fr_proc, -@@ -577,11 +619,33 @@ static void child_setup (gpointer user_d - putenv ("LC_ALL=C"); - } - -+static GList * -+string_list_split_at_strlen (GList *strings, gint max_len) -+{ -+ gint len = 0; -+ GList *l; -+ -+ for (l = strings; l; l = l->next) { -+ len += strlen (strings->data) + 1; -+ -+ if (len > max_len && l->prev) -+ break; -+ } -+ -+ if (l && l->prev) { -+ l->prev->next = NULL; -+ l->prev = NULL; -+ return l; -+ } -+ -+ return NULL; -+} - - static void - start_current_command (FrProcess *fr_proc) - { - FRCommandInfo *c_info; -+ gboolean ran_before = FALSE; - GList *arg_list, *scan; - GString *command; - char *dir; -@@ -595,6 +659,17 @@ start_current_command (FrProcess *fr_pro - arg_list = c_info->args; - dir = c_info->dir; - -+ /* If command line would be too long, split up command */ -+ -+ if (c_info->files != NULL) { -+ g_list_foreach (c_info->files, (GFunc) g_free, NULL); -+ g_list_free (c_info->files); -+ ran_before = TRUE; -+ } -+ -+ c_info->files = c_info->files_next; -+ c_info->files_next = string_list_split_at_strlen (c_info->files, FILES_LIST_LENGTH_MAX); -+ - if (dir != NULL) - debug (DEBUG_INFO, "cd %s\n", dir); - -@@ -606,8 +681,19 @@ start_current_command (FrProcess *fr_pro - - command = g_string_new (""); - for (scan = arg_list; scan; scan = scan->next) { -- if (scan->data != NULL) -- g_string_append (command, scan->data); -+ if (scan->data != NULL) { -+ if (scan->data == file_list_insertion_point) { -+ GList *subscan; -+ -+ for (subscan = c_info->files; subscan; subscan = subscan->next) { -+ g_string_append (command, subscan->data); -+ if (subscan->next != NULL) -+ g_string_append_c (command, ' '); -+ } -+ } else { -+ g_string_append (command, scan->data); -+ } -+ } - if (scan->next != NULL) - g_string_append_c (command, ' '); - } -@@ -626,7 +712,7 @@ start_current_command (FrProcess *fr_pro - } - #endif - -- if (c_info->begin_func != NULL) -+ if (c_info->begin_func != NULL && !ran_before) - (*c_info->begin_func) (c_info->begin_data); - - if (! g_spawn_async_with_pipes (dir, -@@ -760,6 +846,14 @@ check_child (gpointer data) - fr_proc->output_fd = 0; - fr_proc->error_fd = 0; - -+ /* If we have more file names to process, re-run the command with -+ * the next batch */ -+ -+ if (fr_proc->error.type == FR_PROC_ERROR_NONE && c_info->files_next) { -+ start_current_command (fr_proc); -+ return FALSE; -+ } -+ - /**/ - - if (c_info->end_func != NULL) -Index: file-roller-2.19.4/src/fr-process.h -=================================================================== ---- file-roller-2.19.4.orig/src/fr-process.h -+++ file-roller-2.19.4/src/fr-process.h -@@ -47,7 +47,9 @@ typedef gboolean (*ContinueFunc) (gpoint - - - typedef struct { -- GList *args; /* command to execute */ -+ GList *args; /* command to execute; same for each invocation */ -+ GList *files; /* list of filenames to process */ -+ GList *files_next; /* next batch of filenames to process */ - char *dir; /* working directory */ - guint sticky : 1; /* whether the command must be executed even - * if a previous command has failed. */ -@@ -147,6 +149,8 @@ void fr_process_set_arg_at - void fr_process_set_begin_func (FrProcess *fr_proc, - ProcFunc func, - gpointer func_data); -+void fr_process_add_file_arg (FrProcess *fr_proc, -+ const char *arg); - void fr_process_set_end_func (FrProcess *fr_proc, - ProcFunc func, - gpointer func_data); -Index: file-roller-2.19.4/src/fr-window.c -=================================================================== ---- file-roller-2.19.4.orig/src/fr-window.c -+++ file-roller-2.19.4/src/fr-window.c -@@ -7043,7 +7043,7 @@ fr_window_open_files_with_command (FrWin - fr_process_begin_command (cdata->process, command); - for (scan = file_list; scan; scan = scan->next) { - char *filename = shell_escape (scan->data); -- fr_process_add_arg (cdata->process, filename); -+ fr_process_add_file_arg (cdata->process, filename); - g_free (filename); - } - fr_process_end_command (cdata->process); diff --git a/file-roller-2.22.2.tar.bz2 b/file-roller-2.22.2.tar.bz2 deleted file mode 100644 index c55db7a..0000000 --- a/file-roller-2.22.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97b819c82dc3c094c5c60978ea8fe1cbd7914cfd0c3a30ffe2d3107735e8f2dc -size 1269504 diff --git a/file-roller-2.23.3.tar.bz2 b/file-roller-2.23.3.tar.bz2 new file mode 100644 index 0000000..52e8ea6 --- /dev/null +++ b/file-roller-2.23.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:693a27098a0f754f62a9430baf392771bcbd83619b6e5f4b01020cf861d88d44 +size 1291172 diff --git a/file-roller.changes b/file-roller.changes index 5690f34..8ce40fd 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Sat Jun 21 01:24:25 CEST 2008 - maw@suse.de + +- Update to version 2.23.3: + + Show an alert dialog when the 'save as' operation is completed, + and allow the user the open the newly created archive + * Load and save the 'add folder' dialog options. Allow to clear + the options as well + * Allow to specify a password when converting an archive to + another format + * Added keyboard shortcut to deselect all; moved "add files" and + "add folders" down in the edit menu; moved "stop" and "reload" + at the bottom of the view menu; removed the 'sort by' submenu + + Added an exclude folder filter to specify sub-folders to ignore + when adding a folder recursively + + Added ability to extract folders from the folder pane using + drag & drop. + + Added partial support for tar archives compressed with 7zip + + Display the progress dialog if the operation lasts more than 5 + seconds + + Display the progress dialog without delay if extracting or + converting an archive; after the extraction add to the progress + dialog the button to open the destination folder and after + the conversion add the button to open the newly created archive + + Removed the 'view folder after extraction' option from the + extraction dialog + + Removed the preview-file stock item, use gtk_stock_open instead + + Do not use the sh command to exec the process, use the utility + command directly to allow to stop the process properly + + Use g_io_channel to read the command output. + + Update to newer GNOME APIs and drop the use of deprecated + libraries and APIs: + * Use GIO library instead of gnome-vfs + * gtk+ is used to get the applications and mime types icons + * Replaced gnome_url_show with g_app_info_launch_default_for_uri + * Use g_app_info_launch_default_for_uri to show the help dialog + * Use the new tooltips API + * Use g_key_file instead of gnome_config for loading/saving + sessions + * Use GRegex instead of the custom utf8_fnmatch function. + + Bugs fixed: bgo#480190, bgo#535967, bgo#536055, bgo#527271, + bgo#532789, bgo#532255, bgo#523158, bgo#516043, and bgo#512474 +- Drop an obsolete patch: + file-roller-2.12.2-no-cmdline-overflow.patch. + ------------------------------------------------------------------- Thu Apr 10 17:49:51 CEST 2008 - maw@suse.de diff --git a/file-roller.spec b/file-roller.spec index e045138..b5a36bf 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.22.2) +# spec file for package file-roller (Version 2.23.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,16 +15,14 @@ Name: file-roller BuildRequires: docbook-xsl-stylesheets fdupes gconf2-devel glib2-devel gnome-doc-utils-devel gnome-vfs2-devel gtk2-devel intltool libglade2-devel libgnome-devel libgnomeui-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.22.2 +Version: 2.23.3 Release: 1 Requires: %{name}-lang = %{version} Summary: An Archive Manager for GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 -#PATCH-FIX-UPSTREAM file-roller-2.12.2-no-cmdline-overflow.patch bnc169646 bgo159240 hpj@novell.com -- Upstream thinks this is obsolete, needs confirmation -Patch2: file-roller-2.12.2-no-cmdline-overflow.patch #PATCH-FIX-UPSTREAM bug-187126_file-roller-batch-extract-all.patch bnc187126 bgo342043 jberkman@novell.com -- Upstream says this is committed but its not Patch3: bug-187126_file-roller-batch-extract-all.patch -#PATCH-FIX-UPSTREAM file-roller-2.20.0-correct-help-uri.patch bnc326492 bgo480442 hpj@novell.com +# PATCH-NEEDS-REBASE file-roller-2.20.0-correct-help-uri.patch bnc326492 bgo480442 hpj@novell.com -- was PATCH-FIX-UPSTREAM Patch5: file-roller-2.20.0-correct-help-uri.patch Url: http://fileroller.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,9 +69,8 @@ Authors: %lang_package %prep %setup -q -%patch2 -p1 %patch3 -p1 -%patch5 -p1 +# %patch5 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -125,6 +122,48 @@ fi %files lang -f %name.lang %changelog +* Sat Jun 21 2008 maw@suse.de +- Update to version 2.23.3: + + Show an alert dialog when the 'save as' operation is completed, + and allow the user the open the newly created archive + * Load and save the 'add folder' dialog options. Allow to clear + the options as well + * Allow to specify a password when converting an archive to + another format + * Added keyboard shortcut to deselect all; moved "add files" and + "add folders" down in the edit menu; moved "stop" and "reload" + at the bottom of the view menu; removed the 'sort by' submenu + + Added an exclude folder filter to specify sub-folders to ignore + when adding a folder recursively + + Added ability to extract folders from the folder pane using + drag & drop. + + Added partial support for tar archives compressed with 7zip + + Display the progress dialog if the operation lasts more than 5 + seconds + + Display the progress dialog without delay if extracting or + converting an archive; after the extraction add to the progress + dialog the button to open the destination folder and after + the conversion add the button to open the newly created archive + + Removed the 'view folder after extraction' option from the + extraction dialog + + Removed the preview-file stock item, use gtk_stock_open instead + + Do not use the sh command to exec the process, use the utility + command directly to allow to stop the process properly + + Use g_io_channel to read the command output. + + Update to newer GNOME APIs and drop the use of deprecated + libraries and APIs: + * Use GIO library instead of gnome-vfs + * gtk+ is used to get the applications and mime types icons + * Replaced gnome_url_show with g_app_info_launch_default_for_uri + * Use g_app_info_launch_default_for_uri to show the help dialog + * Use the new tooltips API + * Use g_key_file instead of gnome_config for loading/saving + sessions + * Use GRegex instead of the custom utf8_fnmatch function. + + Bugs fixed: bgo#480190, bgo#535967, bgo#536055, bgo#527271, + bgo#532789, bgo#532255, bgo#523158, bgo#516043, and bgo#512474 +- Drop an obsolete patch: + file-roller-2.12.2-no-cmdline-overflow.patch. * Thu Apr 10 2008 maw@suse.de - Update to version 2.22.2: + Do not execute sync IO operations in the Nautilus extension in