diff --git a/.gitignore b/.gitignore index f4e9b04..a8e1ebf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.2.8.14.tar.bz2 /gnome-commander-1.2.8.15.tar.xz /gnome-commander-1.2.8.16.tar.xz +/gnome-commander-1.2.8.17.tar.xz diff --git a/gnome-commander-1.2.8.15-format-security.patch b/gnome-commander-1.2.8.15-format-security.patch deleted file mode 100644 index 92fa0db..0000000 --- a/gnome-commander-1.2.8.15-format-security.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc.format 2011-12-07 04:10:27.000000000 +0900 -+++ gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc 2013-12-03 16:29:16.321596112 +0900 -@@ -652,7 +652,7 @@ create_error_dialog (const gchar *msg, . - va_end (argptr); - - dialog = gtk_message_dialog_new (GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL, -- GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, string); -+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg); - - gtk_signal_connect (GTK_OBJECT (dialog), "response", GTK_SIGNAL_FUNC (on_response), dialog); - -@@ -673,7 +673,7 @@ create_warning_dialog (const gchar *msg, - - dialog = gtk_message_dialog_new ( - GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL, -- GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, msg); -+ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", msg); - - gtk_signal_connect (GTK_OBJECT (dialog), "response", - GTK_SIGNAL_FUNC (on_response), dialog); ---- gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc.format 2011-12-07 04:10:28.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc 2013-12-03 16:38:54.968433434 +0900 -@@ -192,6 +192,7 @@ static void on_ok (GtkButton *button, Gn - (GtkDialogFlags) 0, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_OK_CANCEL, -+ "%s", - msg); - gint choice = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); ---- gnome-commander-1.2.8.15/src/utils.cc.format 2011-12-07 04:10:29.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/utils.cc 2013-12-03 16:40:20.887350297 +0900 -@@ -193,7 +193,7 @@ gint run_simple_dialog (GtkWidget *paren - button_titles = convert_varargs_to_name_array (button_title_args); - va_end (button_title_args); - -- dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, text); -+ dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, "%s", text); - if (title) - gtk_window_set_title (GTK_WINDOW (dialog), title); - -@@ -590,7 +590,7 @@ void mime_exec_single (GnomeCmdFile *f) - { - gchar *msg = g_strdup_printf (_("%s does not know how to open remote file. Do you want to download the file to a temporary location and then open it?"), gnome_cmd_app_get_name (app)); - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, -- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, msg); -+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", msg); - TmpDlData *dldata = g_new0 (TmpDlData, 1); - args[0] = (gpointer) app; - // args[2] is NULL here (don't set exec dir for temporarily downloaded files) ---- gnome-commander-1.2.8.15/src/utils.h.format 2011-12-07 04:10:29.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/utils.h 2013-12-03 16:31:38.411012903 +0900 -@@ -256,10 +256,11 @@ inline void gnome_cmd_show_message (GtkW - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, -+ "%s", - message.c_str()); - - if (secondary_text) -- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), secondary_text); -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", secondary_text); - - gtk_dialog_run (GTK_DIALOG (dlg)); - gtk_widget_destroy (dlg); diff --git a/gnome-commander.spec b/gnome-commander.spec index 4597e76..4fdcf58 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -48,7 +48,7 @@ %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.2.8.16 +Version: 1.2.8.17 # Downgrade 3 times, sorry... Epoch: 4 Release: %{fedora_rel}%{?dist} @@ -58,11 +58,10 @@ Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME Group: Applications/File License: GPLv2+ -URL: http://www.nongnu.org/gcmd/ +URL: http://gcmd.github.io/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.xz Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh -Patch3: gnome-commander-1.2.8.15-format-security.patch Patch10: mimeedit-svn1958.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,7 +128,6 @@ ansluta till FTP-servrar och SMB-nätverk. %prep %setup -q -n %{name}-%{version}%{?extratag:-%extratag} -%patch3 -p1 %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -244,6 +242,12 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Jan 14 2014 Mamoru TASAKA - 4:1.2.8.17-1 +- Update to 1.2.8.17 + +* Thu Dec 26 2013 Mamoru TASAKA - 4:1.2.8.16-1 +- Update to 1.2.8.16 + * Tue Dec 03 2013 Rex Dieter - 4:1.2.8.15-12.1 - rebuild (exiv2) diff --git a/sources b/sources index 9bc9edf..c59d211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75122127c0b24d10da96c35c81580f81 gnome-commander-1.2.8.16.tar.xz +9e1fe09fc965f54d706895fecb2b06f4 gnome-commander-1.2.8.17.tar.xz