From 84ab5e40beaf110281570b814ab9ad8dd2bab7fb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 16 Oct 2016 22:27:22 +0900 Subject: [PATCH] 1.6.0 --- .gitignore | 1 + gnome-commander-1.4.7-path-fedora-specific.patch | 11 ----------- gnome-commander-1.6.0-format-security.patch | 11 +++++++++++ gnome-commander-1.6.0-path-fedora-specific.patch | 11 +++++++++++ gnome-commander.spec | 14 ++++++++++---- sources | 2 +- 6 files changed, 34 insertions(+), 16 deletions(-) delete mode 100644 gnome-commander-1.4.7-path-fedora-specific.patch create mode 100644 gnome-commander-1.6.0-format-security.patch create mode 100644 gnome-commander-1.6.0-path-fedora-specific.patch diff --git a/.gitignore b/.gitignore index 0a92231..e871664 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.4.7.tar.xz /gnome-commander-1.4.8.tar.xz /gnome-commander-1.4.9.tar.xz +/gnome-commander-1.6.0.tar.xz diff --git a/gnome-commander-1.4.7-path-fedora-specific.patch b/gnome-commander-1.4.7-path-fedora-specific.patch deleted file mode 100644 index 184910a..0000000 --- a/gnome-commander-1.4.7-path-fedora-specific.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-commander-1.4.7/src/utils.cc.path 2015-05-31 00:17:24.000000000 +0900 -+++ gnome-commander-1.4.7/src/utils.cc 2015-05-31 12:10:44.150102257 +0900 -@@ -113,7 +113,7 @@ - - if (gnome_cmd_data.use_gcmd_block) - { -- gchar *s = g_strdup_printf ("%s; %s/bin/gcmd-block", in_command, PREFIX); -+ gchar *s = g_strdup_printf ("%s; /usr/libexec/%s/gcmd-block", in_command, PACKAGE); - arg = g_shell_quote (s); - g_free (s); - } diff --git a/gnome-commander-1.6.0-format-security.patch b/gnome-commander-1.6.0-format-security.patch new file mode 100644 index 0000000..741ae94 --- /dev/null +++ b/gnome-commander-1.6.0-format-security.patch @@ -0,0 +1,11 @@ +--- gnome-commander-1.6.0/src/gnome-cmd-gkeyfile-utils.cc.format 2016-10-03 05:27:02.000000000 +0900 ++++ gnome-commander-1.6.0/src/gnome-cmd-gkeyfile-utils.cc 2016-10-16 16:19:09.236055904 +0900 +@@ -106,7 +106,7 @@ + return FALSE; + } + +- written = fprintf(fd, contents); ++ written = fprintf(fd, "%s", contents); + if (written < 0) + { + success = FALSE; diff --git a/gnome-commander-1.6.0-path-fedora-specific.patch b/gnome-commander-1.6.0-path-fedora-specific.patch new file mode 100644 index 0000000..cf41058 --- /dev/null +++ b/gnome-commander-1.6.0-path-fedora-specific.patch @@ -0,0 +1,11 @@ +--- gnome-commander-1.6.0/src/utils.cc.path 2016-10-03 05:27:02.000000000 +0900 ++++ gnome-commander-1.6.0/src/utils.cc 2016-10-16 15:14:16.638827912 +0900 +@@ -112,7 +112,7 @@ + + if (gnome_cmd_data.use_gcmd_block) + { +- gchar *s = g_strdup_printf ("bash -c \"%s; %s/bin/gcmd-block\"", in_command, PREFIX); ++ gchar *s = g_strdup_printf ("bash -c \"%s; /usr/libexec/%s/gcmd-block\"", in_command, PACKAGE); + arg = g_shell_quote (s); + g_free (s); + } diff --git a/gnome-commander.spec b/gnome-commander.spec index 1fcba72..319e2bb 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -50,7 +50,7 @@ %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.4.9 +Version: 1.6.0 # Downgrade 3 times, sorry... Epoch: 4 Release: %{fedora_rel}%{?dist} @@ -61,11 +61,12 @@ Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME Group: Applications/File License: GPLv2+ URL: http://gcmd.github.io/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}%{?extratag:-%extratag}.tar.xz +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.6/%{name}-%{version}%{?extratag:-%extratag}.tar.xz #Source0: https://git.gnome.org/browse/gnome-commander/snapshot/%{name}-%{githash}.tar.xz Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh -Patch1: gnome-commander-1.4.7-path-fedora-specific.patch +Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch2: gnome-commander-1.6.0-format-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -137,6 +138,7 @@ ansluta till FTP-servrar och SMB-nätverk. #%%setup -q -n %{name}-%{githash} %patch1 -p1 -b .path +%patch2 -p1 -b .format %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -257,7 +259,6 @@ exit 0 %doc COPYING %doc NEWS %doc README -%doc README.commits %doc TODO %doc doc/*.txt @@ -275,10 +276,15 @@ exit 0 %dir %{_datadir}/%{name} %{_datadir}/%{name}/mime +%{_datadir}/glib-2.0/schemas/org.gnome.*xml + %{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Oct 16 2016 Mamoru TASAKA - 4:1.6.0-1 +- 1.6.0 + * Sun Sep 25 2016 Mamoru TASAKA - 4:1.4.9-1 - 1.4.9 diff --git a/sources b/sources index 48f1328..bd91261 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbbcd6aa66c89f72d1fff65d4e007028 gnome-commander-1.4.9.tar.xz +a4b1e8beef491e67e1c85e796c67b168 gnome-commander-1.6.0.tar.xz