OBS User unknown 2007-08-02 22:13:19 +00:00 committed by Git OBS Bridge
parent 65125dc974
commit efb7b2f740
6 changed files with 120 additions and 90 deletions

View File

@ -1,8 +1,8 @@
Index: file-roller-2.19.2/src/fr-archive.c
Index: file-roller-2.19.4/src/fr-archive.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-archive.c
+++ file-roller-2.19.2/src/fr-archive.c
@@ -2703,7 +2703,7 @@ move_files_to_dir (FrArchive *archive,
--- 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);
@ -11,11 +11,11 @@ Index: file-roller-2.19.2/src/fr-archive.c
g_free (e_filename);
}
Index: file-roller-2.19.2/src/fr-command-ar.c
Index: file-roller-2.19.4/src/fr-command-ar.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-ar.c
+++ file-roller-2.19.2/src/fr-command-ar.c
@@ -225,7 +225,7 @@ fr_command_ar_add (FrCommand *comm,
--- 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)
@ -24,7 +24,7 @@ Index: file-roller-2.19.2/src/fr-command-ar.c
fr_process_end_command (comm->process);
}
@@ -243,7 +243,7 @@ fr_command_ar_delete (FrCommand *comm,
@@ -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)
@ -33,7 +33,7 @@ Index: file-roller-2.19.2/src/fr-command-ar.c
fr_process_end_command (comm->process);
}
@@ -268,7 +268,7 @@ fr_command_ar_extract (FrCommand *comm,
@@ -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)
@ -42,11 +42,11 @@ Index: file-roller-2.19.2/src/fr-command-ar.c
fr_process_end_command (comm->process);
}
Index: file-roller-2.19.2/src/fr-command-arj.c
Index: file-roller-2.19.4/src/fr-command-arj.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-arj.c
+++ file-roller-2.19.2/src/fr-command-arj.c
@@ -217,7 +217,7 @@ fr_command_arj_add (FrCommand *comm,
--- 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)
@ -55,7 +55,7 @@ Index: file-roller-2.19.2/src/fr-command-arj.c
fr_process_end_command (comm->process);
}
@@ -239,7 +239,7 @@ fr_command_arj_delete (FrCommand *comm,
@@ -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)
@ -64,7 +64,7 @@ Index: file-roller-2.19.2/src/fr-command-arj.c
fr_process_end_command (comm->process);
}
@@ -290,7 +290,7 @@ fr_command_arj_extract (FrCommand *comm
@@ -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)
@ -73,11 +73,11 @@ Index: file-roller-2.19.2/src/fr-command-arj.c
fr_process_end_command (comm->process);
}
Index: file-roller-2.19.2/src/fr-command-lha.c
Index: file-roller-2.19.4/src/fr-command-lha.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-lha.c
+++ file-roller-2.19.2/src/fr-command-lha.c
@@ -242,7 +242,7 @@ fr_command_lha_add (FrCommand *comm,
--- 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)
@ -86,7 +86,7 @@ Index: file-roller-2.19.2/src/fr-command-lha.c
fr_process_end_command (comm->process);
}
@@ -258,7 +258,7 @@ fr_command_lha_delete (FrCommand *comm,
@@ -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)
@ -95,7 +95,7 @@ Index: file-roller-2.19.2/src/fr-command-lha.c
fr_process_end_command (comm->process);
}
@@ -296,7 +296,7 @@ fr_command_lha_extract (FrCommand *comm
@@ -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)
@ -104,11 +104,11 @@ Index: file-roller-2.19.2/src/fr-command-lha.c
fr_process_end_command (comm->process);
}
Index: file-roller-2.19.2/src/fr-command-rar.c
Index: file-roller-2.19.4/src/fr-command-rar.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-rar.c
+++ file-roller-2.19.2/src/fr-command-rar.c
@@ -263,7 +263,7 @@ fr_command_rar_add (FrCommand *comm,
--- 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)
@ -117,7 +117,7 @@ Index: file-roller-2.19.2/src/fr-command-rar.c
fr_process_end_command (comm->process);
}
@@ -284,7 +284,7 @@ fr_command_rar_delete (FrCommand *comm,
@@ -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)
@ -126,7 +126,7 @@ Index: file-roller-2.19.2/src/fr-command-rar.c
fr_process_end_command (comm->process);
}
@@ -329,7 +329,7 @@ fr_command_rar_extract (FrCommand *comm
@@ -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)
@ -135,11 +135,11 @@ Index: file-roller-2.19.2/src/fr-command-rar.c
if (dest_dir != NULL) {
char *e_dest_dir = fr_command_escape (comm, dest_dir);
Index: file-roller-2.19.2/src/fr-command-rpm.c
Index: file-roller-2.19.4/src/fr-command-rpm.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-rpm.c
+++ file-roller-2.19.2/src/fr-command-rpm.c
@@ -177,7 +177,7 @@ fr_command_rpm_extract (FrCommand *comm
--- 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;
@ -148,11 +148,11 @@ Index: file-roller-2.19.2/src/fr-command-rpm.c
}
fr_process_end_command (comm->process);
fr_process_start (comm->process);
Index: file-roller-2.19.2/src/fr-command-tar.c
Index: file-roller-2.19.4/src/fr-command-tar.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-tar.c
+++ file-roller-2.19.2/src/fr-command-tar.c
@@ -327,7 +327,7 @@ fr_command_tar_add (FrCommand *comm,
--- 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)
@ -161,7 +161,7 @@ Index: file-roller-2.19.2/src/fr-command-tar.c
fr_process_end_command (comm->process);
}
@@ -371,7 +371,7 @@ fr_command_tar_delete (FrCommand *comm,
@@ -373,7 +373,7 @@ fr_command_tar_delete (FrCommand *comm,
fr_process_add_arg (comm->process, "--");
for (scan = file_list; scan; scan = scan->next)
@ -170,7 +170,7 @@ Index: file-roller-2.19.2/src/fr-command-tar.c
fr_process_end_command (comm->process);
}
@@ -418,7 +418,7 @@ fr_command_tar_extract (FrCommand *comm
@@ -420,7 +420,7 @@ fr_command_tar_extract (FrCommand *comm
fr_process_add_arg (comm->process, "--");
for (scan = file_list; scan; scan = scan->next)
@ -179,10 +179,10 @@ Index: file-roller-2.19.2/src/fr-command-tar.c
fr_process_end_command (comm->process);
}
Index: file-roller-2.19.2/src/fr-command-unstuff.c
Index: file-roller-2.19.4/src/fr-command-unstuff.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-unstuff.c
+++ file-roller-2.19.2/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
@ -192,11 +192,11 @@ Index: file-roller-2.19.2/src/fr-command-unstuff.c
#endif
fr_process_end_command (comm->process);
Index: file-roller-2.19.2/src/fr-command-zip.c
Index: file-roller-2.19.4/src/fr-command-zip.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-zip.c
+++ file-roller-2.19.2/src/fr-command-zip.c
@@ -317,7 +317,7 @@ fr_command_zip_add (FrCommand *comm,
--- 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);
@ -205,7 +205,7 @@ Index: file-roller-2.19.2/src/fr-command-zip.c
g_free (temp);
}
@@ -341,7 +341,7 @@ fr_command_zip_delete (FrCommand *comm,
@@ -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);
@ -214,7 +214,7 @@ Index: file-roller-2.19.2/src/fr-command-zip.c
g_free (temp);
}
@@ -390,7 +390,7 @@ fr_command_zip_extract (FrCommand *comm
@@ -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);
@ -223,11 +223,11 @@ Index: file-roller-2.19.2/src/fr-command-zip.c
g_free (temp);
}
Index: file-roller-2.19.2/src/fr-command-zoo.c
Index: file-roller-2.19.4/src/fr-command-zoo.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-command-zoo.c
+++ file-roller-2.19.2/src/fr-command-zoo.c
@@ -257,7 +257,7 @@ fr_command_zoo_add (FrCommand *comm,
--- 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)
@ -236,7 +236,7 @@ Index: file-roller-2.19.2/src/fr-command-zoo.c
fr_process_end_command (comm->process);
}
@@ -275,7 +275,7 @@ fr_command_zoo_delete (FrCommand *comm,
@@ -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)
@ -245,7 +245,7 @@ Index: file-roller-2.19.2/src/fr-command-zoo.c
fr_process_end_command (comm->process);
}
@@ -304,7 +304,7 @@ fr_command_zoo_extract (FrCommand *comm
@@ -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)
@ -254,10 +254,10 @@ Index: file-roller-2.19.2/src/fr-command-zoo.c
fr_process_end_command (comm->process);
}
Index: file-roller-2.19.2/src/fr-process.c
Index: file-roller-2.19.4/src/fr-process.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-process.c
+++ file-roller-2.19.2/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
};
@ -431,10 +431,10 @@ Index: file-roller-2.19.2/src/fr-process.c
/**/
if (c_info->end_func != NULL)
Index: file-roller-2.19.2/src/fr-process.h
Index: file-roller-2.19.4/src/fr-process.h
===================================================================
--- file-roller-2.19.2.orig/src/fr-process.h
+++ file-roller-2.19.2/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
@ -455,16 +455,16 @@ Index: file-roller-2.19.2/src/fr-process.h
void fr_process_set_end_func (FrProcess *fr_proc,
ProcFunc func,
gpointer func_data);
Index: file-roller-2.19.2/src/fr-window.c
Index: file-roller-2.19.4/src/fr-window.c
===================================================================
--- file-roller-2.19.2.orig/src/fr-window.c
+++ file-roller-2.19.2/src/fr-window.c
@@ -6448,7 +6448,7 @@ fr_window_open_files__extract_done_cb (F
fr_process_begin_command (proc, cdata->command);
for (scan = cdata->file_list; scan; scan = scan->next) {
char *filename = shell_escape (scan->data);
- fr_process_add_arg (proc, filename);
+ fr_process_add_file_arg (proc, filename);
g_free (filename);
}
fr_process_end_command (proc);
--- 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);

View File

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

View File

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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Aug 2 23:11:35 CEST 2007 - maw@suse.de
- Update to version 2.19.4:
+ Support for drag and drop among file-roller windows
+ Added a folders pane
+ Fixed DST calculation
+ Save and restore filename column width
+ Unescape the archive filename in the tree view
+ Add a sidebar context menu
+ Get mime types from files' content
+ Bugs (bugzilla.gnome.org) fixed: #402756, #461356, and #450150
- Use %fdupes.
-------------------------------------------------------------------
Mon Jul 9 23:31:05 CEST 2007 - maw@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package file-roller (Version 2.19.2)
# spec file for package file-roller (Version 2.19.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -11,10 +11,10 @@
# norootforbuild
Name: file-roller
BuildRequires: docbook-xsl-stylesheets gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files
BuildRequires: docbook-xsl-stylesheets fdupes gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser scrollkeeper update-desktop-files
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.19.2
Version: 2.19.4
Release: 1
Summary: An Archive Manager for GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2
@ -92,6 +92,8 @@ make %{?jobs:-j%jobs}
cat %{name}.lang %{name}.schemas_list >%{name}.lst
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@ -125,6 +127,17 @@ fi
%{_libdir}/nautilus/extensions-*/*.so
%changelog
* Thu Aug 02 2007 - maw@suse.de
- Update to version 2.19.4:
+ Support for drag and drop among file-roller windows
+ Added a folders pane
+ Fixed DST calculation
+ Save and restore filename column width
+ Unescape the archive filename in the tree view
+ Add a sidebar context menu
+ Get mime types from files' content
+ Bugs (bugzilla.gnome.org) fixed: #402756, #461356, and #450150
- Use %%fdupes.
* Mon Jul 09 2007 - maw@suse.de
- Update to version 2.19.2
- Can operate on remote archives

View File

@ -1,9 +1,11 @@
Index: file-roller-2.18.0/ChangeLog
Index: file-roller-2.19.4/ChangeLog
===================================================================
--- file-roller-2.18.0.orig/ChangeLog
+++ file-roller-2.18.0/ChangeLog
@@ -1,4 +1,11 @@
--- file-roller-2.19.4.orig/ChangeLog
+++ file-roller-2.19.4/ChangeLog
@@ -809,6 +809,13 @@
* configure.in: changed version to 2.19.0
2007-03-12 Paolo Bacchilega <paobac@cvs.gnome.org>
+2004-06-16 Subrahmanyam Madduri <smadduri@novell.com>
+
@ -15,22 +17,23 @@ Index: file-roller-2.18.0/ChangeLog
[ File Roller 2.18.0 released ]
Index: file-roller-2.18.0/src/ui.h
Index: file-roller-2.19.4/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[] =
--- file-roller-2.19.4.orig/src/ui.h
+++ file-roller-2.19.4/src/ui.h
@@ -108,7 +108,10 @@ static GtkActionEntry action_entries[] =
NULL, NULL,
N_("Delete the selection from the archive"),
G_CALLBACK (activate_action_delete) },
G_CALLBACK (activate_action_delete_folder_from_sidebar) },
-
+ { "DeleteFile_Toolbar", GTK_STOCK_REMOVE,
+ N_("Delete"), NULL,
+ N_("Delete file from the archive"),
+ G_CALLBACK (activate_action_delete) },
+ N_("Delete"), NULL,
+ N_("Delete file from the archive"),
+ G_CALLBACK (activate_action_delete) },
{ "DeselectAll", NULL,
N_("Dese_lect All"), NULL,
N_("Deselect all files"),
@@ -276,6 +280,7 @@ static const gchar *ui_info =
@@ -313,6 +316,7 @@ static const gchar *ui_info =
" <toolbar name='ToolBar'>"
" <toolitem action='New'/>"
" <toolitem action='Extract_Toolbar'/>"