rpm/file-roller
SHA256
1
0
Fork 0
forked from pool/file-roller
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2007-04-03 19:22:32 +00:00 committed by Git OBS Bridge
parent 4aeff8e1d6
commit c0b7369177
8 changed files with 199 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bug-187126_file-roller-batch-extract-all.patch
View File

@ -14,29 +14,33 @@ 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
--- file-roller-2.12.2/src/window.h~ 2005-11-28 15:55:02.000000000 -0500
+++ file-roller-2.12.2/src/window.h 2006-12-11 14:28:10.000000000 -0500
@@ -192,6 +192,7 @@ typedef struct {
gboolean extracting_dragged_files;
gboolean extracting_dragged_files_interrupted;
Index: file-roller-2.18.0/src/window.h
===================================================================
--- file-roller-2.18.0.orig/src/window.h
+++ file-roller-2.18.0/src/window.h
@@ -201,6 +201,7 @@ typedef struct {
* operation. */
gboolean batch_adding_one_file;
+ gboolean batch_extracting_all;
/* progress dialog data */
--- file-roller-2.12.2/src/window.c~ 2006-12-11 14:48:27.000000000 -0500
+++ file-roller-2.12.2/src/window.c 2006-12-11 14:52:09.000000000 -0500
@@ -3096,7 +3096,8 @@ window_fake_load (FRArchive *archive,
return (window->batch_mode
Index: file-roller-2.18.0/src/window.c
===================================================================
--- file-roller-2.18.0.orig/src/window.c
+++ file-roller-2.18.0/src/window.c
@@ -3309,7 +3309,8 @@ window_fake_load (FRArchive *archive,
return (window->batch_mode
&& ! (window->add_after_opening && window->update_dropped_files && ! archive->command->propAddCanUpdate)
- && ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace));
+ && ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace)
&& ! (window->add_after_opening && ! window->update_dropped_files && ! archive->command->propAddCanReplace)
- && archive->command->propCanExtractAll);
+ && ! (window->batch_extracting_all && !archive->command->propCanExtractAll));
+
}
@@ -3446,6 +3447,7 @@ window_new (void)
@@ -3682,6 +3683,7 @@ window_new (void)
window->stoppable = TRUE;
window->batch_adding_one_file = FALSE;
@ -44,8 +48,8 @@ Original bug: https://launchpad.net/distros/ubuntu/+source/file-roller/+bug/4089
window->path_clicked = NULL;
@@ -6040,6 +6042,7 @@ window_archive__open_extract (FRWindow
{
@@ -6738,6 +6740,7 @@ window_archive__open_extract_here (FRWin
window->non_interactive = TRUE;
+ window->batch_extracting_all = TRUE;

204
file-roller-2.12.2-no-cmdline-overflow.patch
View File

@ -1,17 +1,21 @@
--- file-roller-2.15.90/src/fr-archive.c
+++ file-roller-2.15.90/src/fr-archive.c
@@ -1451,7 +1451,7 @@
Index: file-roller-2.18.0/src/fr-archive.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-archive.c
+++ file-roller-2.18.0/src/fr-archive.c
@@ -1487,7 +1487,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);
}
--- file-roller-2.15.90/src/fr-command-ar.c
+++ file-roller-2.15.90/src/fr-command-ar.c
@@ -227,7 +227,7 @@
Index: file-roller-2.18.0/src/fr-command-ar.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-ar.c
+++ file-roller-2.18.0/src/fr-command-ar.c
@@ -225,7 +225,7 @@ fr_command_ar_add (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -20,7 +24,7 @@
fr_process_end_command (comm->process);
}
@@ -245,7 +245,7 @@
@@ -243,7 +243,7 @@ fr_command_ar_delete (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -29,7 +33,7 @@
fr_process_end_command (comm->process);
}
@@ -270,7 +270,7 @@
@@ -268,7 +268,7 @@ fr_command_ar_extract (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -38,9 +42,11 @@
fr_process_end_command (comm->process);
}
--- file-roller-2.15.90/src/fr-command-arj.c
+++ file-roller-2.15.90/src/fr-command-arj.c
@@ -219,7 +219,7 @@
Index: file-roller-2.18.0/src/fr-command-arj.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-arj.c
+++ file-roller-2.18.0/src/fr-command-arj.c
@@ -217,7 +217,7 @@ fr_command_arj_add (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -49,7 +55,7 @@
fr_process_end_command (comm->process);
}
@@ -241,7 +241,7 @@
@@ -239,7 +239,7 @@ fr_command_arj_delete (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -58,7 +64,7 @@
fr_process_end_command (comm->process);
}
@@ -292,7 +292,7 @@
@@ -290,7 +290,7 @@ fr_command_arj_extract (FRCommand *comm
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -67,9 +73,11 @@
fr_process_end_command (comm->process);
}
--- file-roller-2.15.90/src/fr-command-lha.c
+++ file-roller-2.15.90/src/fr-command-lha.c
@@ -231,7 +231,7 @@
Index: file-roller-2.18.0/src/fr-command-lha.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-lha.c
+++ file-roller-2.18.0/src/fr-command-lha.c
@@ -234,7 +234,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)
@ -78,7 +86,7 @@
fr_process_end_command (comm->process);
}
@@ -247,7 +247,7 @@
@@ -250,7 +250,7 @@ fr_command_lha_delete (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -87,7 +95,7 @@
fr_process_end_command (comm->process);
}
@@ -285,7 +285,7 @@
@@ -288,7 +288,7 @@ fr_command_lha_extract (FRCommand *comm
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -96,9 +104,11 @@
fr_process_end_command (comm->process);
}
--- file-roller-2.15.90/src/fr-command-rar.c
+++ file-roller-2.15.90/src/fr-command-rar.c
@@ -258,7 +258,7 @@
Index: file-roller-2.18.0/src/fr-command-rar.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-rar.c
+++ file-roller-2.18.0/src/fr-command-rar.c
@@ -263,7 +263,7 @@ fr_command_rar_add (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -107,7 +117,7 @@
fr_process_end_command (comm->process);
}
@@ -279,7 +279,7 @@
@@ -284,7 +284,7 @@ fr_command_rar_delete (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -116,7 +126,7 @@
fr_process_end_command (comm->process);
}
@@ -324,7 +324,7 @@
@@ -329,7 +329,7 @@ fr_command_rar_extract (FRCommand *comm
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -125,10 +135,12 @@
if (dest_dir != NULL) {
char *e_dest_dir = fr_command_escape (comm, dest_dir);
--- file-roller-2.15.90/src/fr-command-rpm.c
+++ file-roller-2.15.90/src/fr-command-rpm.c
@@ -157,7 +157,7 @@
fr_process_add_arg (comm->process, "| cpio --extract --force-local --unconditional --make-directories");
Index: file-roller-2.18.0/src/fr-command-rpm.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-rpm.c
+++ file-roller-2.18.0/src/fr-command-rpm.c
@@ -177,7 +177,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);
@ -136,38 +148,42 @@
}
fr_process_end_command (comm->process);
fr_process_start (comm->process);
--- file-roller-2.15.90/src/fr-command-tar.c
+++ file-roller-2.15.90/src/fr-command-tar.c
@@ -323,7 +323,7 @@
Index: file-roller-2.18.0/src/fr-command-tar.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-tar.c
+++ file-roller-2.18.0/src/fr-command-tar.c
@@ -325,7 +325,7 @@ fr_command_tar_add (FRCommand *comm,
fr_process_add_arg (comm->process, c_tar->uncomp_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);
}
@@ -365,7 +365,7 @@
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);
}
@@ -408,7 +408,7 @@
}
@@ -368,7 +368,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);
}
@@ -413,7 +413,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);
}
--- file-roller-2.15.90/src/fr-command-unstuff.c
+++ file-roller-2.15.90/src/fr-command-unstuff.c
@@ -249,7 +249,7 @@
Index: file-roller-2.18.0/src/fr-command-unstuff.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-unstuff.c
+++ file-roller-2.18.0/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)
@ -176,9 +192,11 @@
#endif
fr_process_end_command (comm->process);
--- file-roller-2.15.90/src/fr-command-zip.c
+++ file-roller-2.15.90/src/fr-command-zip.c
@@ -318,7 +318,7 @@
Index: file-roller-2.18.0/src/fr-command-zip.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-zip.c
+++ file-roller-2.18.0/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);
@ -187,7 +205,7 @@
g_free (temp);
}
@@ -342,7 +342,7 @@
@@ -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);
@ -196,7 +214,7 @@
g_free (temp);
}
@@ -391,7 +391,7 @@
@@ -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);
@ -205,9 +223,11 @@
g_free (temp);
}
--- file-roller-2.15.90/src/fr-command-zoo.c
+++ file-roller-2.15.90/src/fr-command-zoo.c
@@ -259,7 +259,7 @@
Index: file-roller-2.18.0/src/fr-command-zoo.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-command-zoo.c
+++ file-roller-2.18.0/src/fr-command-zoo.c
@@ -257,7 +257,7 @@ fr_command_zoo_add (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -216,7 +236,7 @@
fr_process_end_command (comm->process);
}
@@ -277,7 +277,7 @@
@@ -275,7 +275,7 @@ fr_command_zoo_delete (FRCommand *comm,
fr_process_add_arg (comm->process, comm->e_filename);
for (scan = file_list; scan; scan = scan->next)
@ -225,7 +245,7 @@
fr_process_end_command (comm->process);
}
@@ -306,7 +306,7 @@
@@ -304,7 +304,7 @@ fr_command_zoo_extract (FRCommand *comm
fr_process_set_working_dir (comm->process, dest_dir);
for (scan = file_list; scan; scan = scan->next)
@ -234,9 +254,11 @@
fr_process_end_command (comm->process);
}
--- file-roller-2.15.90/src/fr-process.c
+++ file-roller-2.15.90/src/fr-process.c
@@ -43,6 +43,11 @@
Index: file-roller-2.18.0/src/fr-process.c
===================================================================
--- file-roller-2.18.0.orig/src/fr-process.c
+++ file-roller-2.18.0/src/fr-process.c
@@ -43,6 +43,11 @@ enum {
LAST_SIGNAL
};
@ -248,7 +270,7 @@
static GObjectClass *parent_class;
static guint fr_process_signals[LAST_SIGNAL] = { 0 };
@@ -67,17 +72,37 @@
@@ -67,17 +72,37 @@ fr_command_info_new ()
static void
@ -287,7 +309,7 @@
if (c_info->dir != NULL) {
g_free (c_info->dir);
c_info->dir = NULL;
@@ -337,6 +362,25 @@
@@ -337,6 +362,25 @@ fr_process_add_arg (FRProcess *fr_proc,
void
@ -310,10 +332,10 @@
+
+
+void
fr_process_set_arg_at (FRProcess *fr_proc,
fr_process_set_arg_at (FRProcess *fr_proc,
int n_comm,
int n_arg,
@@ -575,10 +619,34 @@
@@ -575,10 +619,34 @@ static void child_setup (gpointer user_d
}
@ -348,7 +370,7 @@
GList *arg_list, *scan;
GString *command;
char *dir;
@@ -592,6 +660,17 @@
@@ -592,6 +660,17 @@ start_current_command (FRProcess *fr_pro
arg_list = c_info->args;
dir = c_info->dir;
@ -363,30 +385,32 @@
+ 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);
@@ -603,7 +682,18 @@
if (dir != NULL)
debug (DEBUG_INFO, "cd %s\n", dir);
@@ -603,8 +682,19 @@ start_current_command (FRProcess *fr_pro
command = g_string_new ("");
for (scan = arg_list; scan; scan = scan->next) {
- g_string_append (command, scan->data);
+ 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, ' ');
- 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);
+ }
+ } else {
+ g_string_append (command, scan->data);
+ }
+
if (scan->next != NULL)
g_string_append_c (command, ' ');
}
@@ -622,7 +712,7 @@
@@ -623,7 +713,7 @@ start_current_command (FRProcess *fr_pro
}
#endif
@ -395,7 +419,7 @@
(*c_info->begin_func) (c_info->begin_data);
if (! g_spawn_async_with_pipes (dir,
@@ -755,6 +845,14 @@
@@ -756,6 +846,14 @@ check_child (gpointer data)
fr_proc->output_fd = 0;
fr_proc->error_fd = 0;
@ -410,9 +434,11 @@
/**/
if (c_info->end_func != NULL)
--- file-roller-2.15.90/src/fr-process.h
+++ file-roller-2.15.90/src/fr-process.h
@@ -47,7 +47,9 @@
Index: file-roller-2.18.0/src/fr-process.h
===================================================================
--- file-roller-2.18.0.orig/src/fr-process.h
+++ file-roller-2.18.0/src/fr-process.h
@@ -47,7 +47,9 @@ typedef gboolean (*ContinueFunc) (gpoint
typedef struct {
@ -423,7 +449,7 @@
char *dir; /* working directory */
guint sticky : 1; /* whether the command must be executed even
* if a previous command has failed. */
@@ -144,6 +146,9 @@
@@ -144,6 +146,9 @@ void fr_process_set_arg_at
int n_comm,
int n_arg,
const char *arg);
@ -433,9 +459,11 @@
void fr_process_set_begin_func (FRProcess *fr_proc,
ProcFunc func,
gpointer func_data);
--- file-roller-2.15.90/src/window.c
+++ file-roller-2.15.90/src/window.c
@@ -5914,7 +5914,7 @@
Index: file-roller-2.18.0/src/window.c
===================================================================
--- file-roller-2.18.0.orig/src/window.c
+++ file-roller-2.18.0/src/window.c
@@ -6106,7 +6106,7 @@ window_open_files__extract_done_cb (FRAr
fr_process_begin_command (proc, cdata->command);
for (scan = cdata->file_list; scan; scan = scan->next) {
char *filename = shell_escape (scan->data);

3
file-roller-2.16.1.tar.bz2
View File

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

3
file-roller-2.18.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3305c9a4b832576d0cf63d6040b6aba9e350d6214fba802e4a94d3a0afac4e88
size 1126681

56
file-roller-self-exe.patch
View File

@ -1,56 +0,0 @@
Index: src/fr-archive.c
===================================================================
--- src/fr-archive.c.orig
+++ src/fr-archive.c
@@ -280,7 +280,8 @@ create_command_from_mime_type (FRArchive
filename,
FR_COMPRESS_PROGRAM_BZIP2);
} else if (is_mime_type (mime_type, "application/zip") ||
- is_mime_type (mime_type, "application/x-zip")) {
+ is_mime_type (mime_type, "application/x-zip") ||
+ is_mime_type (mime_type, "application/octet-stream")) {
archive->command = fr_command_zip_new (archive->process,
filename);
} else if (is_mime_type (mime_type, "application/x-zoo")) {
@@ -444,7 +445,8 @@ create_command_from_filename (FRArchive
if (file_extension_is (filename, ".zip")
|| file_extension_is (filename, ".ear")
|| file_extension_is (filename, ".jar")
- || file_extension_is (filename, ".war")) {
+ || file_extension_is (filename, ".war")
+ || file_extension_is (filename, ".exe")) {
archive->command = fr_command_zip_new (archive->process,
filename);
return (archive->command != NULL);
Index: src/main.c
===================================================================
--- src/main.c.orig
+++ src/main.c
@@ -74,6 +74,7 @@ FRFileTypeDescription file_type_desc[] =
{ FR_FILE_TYPE_COMPRESS, ".Z", "application/x-compress", NULL },
{ FR_FILE_TYPE_ISO, ".iso", "application/x-cd-image", NULL },
{ FR_FILE_TYPE_EAR, ".ear", "application/x-ear", N_("Ear (.ear)") },
+ { FR_FILE_TYPE_EXE, ".exe", "application/octet-stream", N_("Self-extracting zip (.exe)") },
{ FR_FILE_TYPE_GZIP, ".gz", "application/x-gzip", NULL},
{ FR_FILE_TYPE_JAR, ".jar", "application/x-jar", N_("Jar (.jar)")},
{ FR_FILE_TYPE_LHA, ".lzh", "application/x-lha", N_("Lha (.lzh)") },
@@ -103,6 +104,7 @@ FRCommandDescription command_desc[] = {
{ "tar", TRUE, TRUE, TRUE, FR_FILE_TYPE_TAR },
{ "zip", TRUE, TRUE, TRUE, FR_FILE_TYPE_ZIP },
{ "unzip", TRUE, FALSE, TRUE, FR_FILE_TYPE_ZIP },
+ { "zip", TRUE, TRUE, TRUE, FR_FILE_TYPE_EXE },
{ "rar", TRUE, TRUE, TRUE, FR_FILE_TYPE_RAR },
{ "gzip", TRUE, TRUE, FALSE, FR_FILE_TYPE_GZIP },
{ "bzip2", TRUE, TRUE, FALSE, FR_FILE_TYPE_BZIP2 },
Index: src/typedefs.h
===================================================================
--- src/typedefs.h.orig
+++ src/typedefs.h
@@ -93,6 +93,7 @@ typedef enum {
FR_FILE_TYPE_COMPRESS,
FR_FILE_TYPE_ISO,
FR_FILE_TYPE_EAR,
+ FR_FILE_TYPE_EXE,
FR_FILE_TYPE_GZIP,
FR_FILE_TYPE_JAR,
FR_FILE_TYPE_LHA,

16
file-roller.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Apr 2 17:36:55 CDT 2007 - maw@suse.de
- Build with -fno-strict-aliasing
- Package %{_libdir}/file-roller.
-------------------------------------------------------------------
Mon Apr 2 15:36:24 CDT 2007 - maw@suse.de
- Update to version 2.18.0
- "Application" is not a valid category in the freedesktop
specification, so remove it from data/file-roller.desktop.in.in
- Code cleanups
- b.g.o 409433, 396775, and 395074
- Remove upstreamed file-roller-self-exe.patch.
-------------------------------------------------------------------
Thu Mar 8 12:42:36 CET 2007 - sbrabec@suse.cz

24
file-roller.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package file-roller (Version 2.16.1)
# spec file for package file-roller (Version 2.18.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,15 +14,14 @@ Name: file-roller
BuildRequires: docbook-xsl-stylesheets gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files
License: GNU General Public License (GPL)
Group: System/GUI/GNOME
Version: 2.16.1
Release: 43
Version: 2.18.0
Release: 1
Summary: An Archive Manager for GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.6/%{name}-%{version}.tar.bz2
Patch: file-roller-ximian-defaults.patch
Patch1: fr_59941.diff
Patch2: file-roller-2.12.2-no-cmdline-overflow.patch
Patch3: bug-187126_file-roller-batch-extract-all.patch
Patch4: file-roller-self-exe.patch
URL: http://fileroller.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@ -74,10 +73,10 @@ gnome-patch-translation-prepare
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p0
gnome-patch-translation-update
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
autoreconf -i -f
%configure\
--disable-schemas-install\
@ -118,13 +117,26 @@ fi
%defattr(-, root, root)
%doc AUTHORS NEWS README COPYING
%{_bindir}/file-roller
%dir %{_libdir}/file-roller
%{_libdir}/file-roller/*.sh
%{_datadir}/applications/*.desktop
%{_datadir}/file-roller
%{_datadir}/icons/hicolor/48x48/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/omf/file-roller
%{_libdir}/nautilus/extensions-*/*.so
%changelog
* Mon Apr 02 2007 - maw@suse.de
- Build with -fno-strict-aliasing
- Package %%{_libdir}/file-roller.
* Mon Apr 02 2007 - maw@suse.de
- Update to version 2.18.0
- "Application" is not a valid category in the freedesktop
specification, so remove it from data/file-roller.desktop.in.in
- Code cleanups
- b.g.o 409433, 396775, and 395074
- Remove upstreamed file-roller-self-exe.patch.
* Thu Mar 08 2007 - sbrabec@suse.cz
- Removed obsolete hicolor icon symlink (#248676).
* Mon Jan 15 2007 - sbrabec@suse.cz

47
fr_59941.diff
View File

@ -1,7 +1,10 @@
--- file-roller_bak/ChangeLog 2004-06-19 22:19:21.000000000 +0530
+++ file-roller/ChangeLog 2004-06-22 13:59:01.773155328 +0530
@@ -1,0 +1,7 @@
Index: file-roller-2.18.0/ChangeLog
===================================================================
--- file-roller-2.18.0.orig/ChangeLog
+++ file-roller-2.18.0/ChangeLog
@@ -1,4 +1,11 @@
2007-03-12 Paolo Bacchilega <paobac@cvs.gnome.org>
+2004-06-16 Subrahmanyam Madduri <smadduri@novell.com>
+
+ * src/ui.h : (action_entries): Added any entry for the "Delete File"
@ -9,25 +12,29 @@
+ activate_action_delete in actions.c
+ Fixes bug #144800
+
--- file-roller_bak/src/ui.h 2004-05-02 23:55:57.000000000 +0530
+++ file-roller/src/ui.h 2004-06-22 13:50:54.445240432 +0530
@@ -50,6 +50,11 @@
N_("Add"), NULL,
N_("Add files to the archive"),
G_CALLBACK (activate_action_add_files) },
+ { "DeleteFile_Toolbar", GTK_STOCK_REMOVE,
[ File Roller 2.18.0 released ]
Index: file-roller-2.18.0/src/ui.h
===================================================================
--- file-roller-2.18.0.orig/src/ui.h
+++ file-roller-2.18.0/src/ui.h
@@ -78,6 +78,10 @@ static GtkActionEntry action_entries[] =
NULL, NULL,
N_("Delete the selection from the archive"),
G_CALLBACK (activate_action_delete) },
+ { "DeleteFile_Toolbar", GTK_STOCK_REMOVE,
+ N_("Delete"), NULL,
+ N_("Delete file from the archive"),
+ G_CALLBACK (activate_action_delete) },
+
{ "AddFolder", FR_STOCK_ADD,
N_("Add a _Folder..."), NULL,
N_("Add a folder to the archive"),
@@ -299,6 +304,7 @@
" <separator name='sep01'/>"
" <toolitem action='AddFiles_Toolbar'/>"
{ "DeselectAll", NULL,
N_("Dese_lect All"), NULL,
N_("Deselect all files"),
@@ -276,6 +280,7 @@ static const gchar *ui_info =
" <toolbar name='ToolBar'>"
" <toolitem action='New'/>"
" <toolitem action='Extract_Toolbar'/>"
+" <toolitem action='DeleteFile_Toolbar'/>"
" <toolitem action='ViewSelection_Toolbar'/>"
" <separator name='sep02'/>"
" <toolitem action='Stop'/>"
" <separator/>"
" <toolitem action='AddFiles_Toolbar'/>"
" <toolitem action='AddFolder_Toolbar'/>"