Mamoru TASAKA 9 years ago
parent 2017d08745
commit 8241e77052

1
.gitignore vendored

@ -19,3 +19,4 @@ gnome-commander-1.2.8.7.tar.bz2
/gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz /gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz
/gnome-commander-1.4.6.tar.xz /gnome-commander-1.4.6.tar.xz
/gnome-commander-1.4.7.tar.xz /gnome-commander-1.4.7.tar.xz
/gnome-commander-1.4.8.tar.xz

@ -1,34 +0,0 @@
From 6bf9864e1117cce8fbc3c8d7874950cdaba5e3f2 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Fri, 5 Feb 2016 02:06:43 +0900
Subject: [PATCH] Make code compile with gcc6 -Werror=format-security
---
src/gnome-cmd-xml-config.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index 6a38c57..ef2ebb5 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -849,7 +849,7 @@ gboolean gnome_cmd_xml_config_parse (const gchar *xml, gsize xml_len, GnomeCmdDa
if (!g_markup_parse_context_parse (context, xml, xml_len, &error) ||
!g_markup_parse_context_end_parse (context, &error))
{
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
}
@@ -870,7 +870,7 @@ gboolean gnome_cmd_xml_config_load (const gchar *path, GnomeCmdData &cfg)
if (!g_file_get_contents (path, &xml, &xml_len, &error))
{
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
return FALSE;
--
2.7.0

@ -28,7 +28,7 @@
%global use_autotool 0 %global use_autotool 0
%global update_po 0 %global update_po 0
%global if_pre 0 %global if_pre 0
%global main_release 2 %global main_release 1
#%%global extratag %{git_pull_JST}git%{shorthash} #%%global extratag %{git_pull_JST}git%{shorthash}
%undefine extratag %undefine extratag
%global mimeedit_rev 1958 %global mimeedit_rev 1958
@ -50,7 +50,7 @@
%global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
Name: gnome-commander Name: gnome-commander
Version: 1.4.7 Version: 1.4.8
# Downgrade 3 times, sorry... # Downgrade 3 times, sorry...
Epoch: 4 Epoch: 4
Release: %{fedora_rel}%{?dist} Release: %{fedora_rel}%{?dist}
@ -66,8 +66,6 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{versi
Source1: gnome-commander.sh Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch1: gnome-commander-1.4.7-path-fedora-specific.patch Patch1: gnome-commander-1.4.7-path-fedora-specific.patch
# Fix for gcc6 -Werror=format-security
Patch10: gcmd-1-4-0001-Make-code-compile-with-gcc6-Werror-format-security.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -139,7 +137,6 @@ ansluta till FTP-servrar och SMB-nätverk.
#%%setup -q -n %{name}-%{githash} #%%setup -q -n %{name}-%{githash}
%patch1 -p1 -b .path %patch1 -p1 -b .path
%patch10 -p1 -b .format
%if 0%{use_autotool} > 0 %if 0%{use_autotool} > 0
( export NOCONFIGURE=1 ; sh autogen.sh ) ( export NOCONFIGURE=1 ; sh autogen.sh )
@ -282,6 +279,9 @@ exit 0
%{_datadir}/pixmaps/%{name}/ %{_datadir}/pixmaps/%{name}/
%changelog %changelog
* Wed Mar 16 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.8-1
- 1.4.8
* Fri Feb 5 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.7-2 * Fri Feb 5 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.7-2
- Fix for gcc6 -Werror=format-security - Fix for gcc6 -Werror=format-security

@ -1 +1 @@
347337051c10745158200762ae29fa22 gnome-commander-1.4.7.tar.xz f999e5c52f819213955ecb1ec86ecfd0 gnome-commander-1.4.8.tar.xz

Loading…
Cancel
Save