From 9d3fbfc3fed8cf9169738b48a2ce91414f9a96e2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 7 Apr 2014 16:19:42 +0900 Subject: [PATCH] Update to 1.4.1 --- .gitignore | 1 + gnome-commander-1.4.0-vtable.patch | 20 -------------------- gnome-commander.spec | 13 ++++++------- sources | 2 +- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 gnome-commander-1.4.0-vtable.patch diff --git a/.gitignore b/.gitignore index 9730d4f..c87fd64 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.2.8.16.tar.xz /gnome-commander-1.2.8.17.tar.xz /gnome-commander-1.4.0.tar.xz +/gnome-commander-1.4.1.tar.xz diff --git a/gnome-commander-1.4.0-vtable.patch b/gnome-commander-1.4.0-vtable.patch deleted file mode 100644 index 0c7ebd9..0000000 --- a/gnome-commander-1.4.0-vtable.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnome-commander-1.4.0/src/gnome-cmd-plain-path.cc.vtable 2014-03-14 06:13:20.000000000 +0900 -+++ gnome-commander-1.4.0/src/gnome-cmd-plain-path.cc 2014-03-19 15:30:07.049438210 +0900 -@@ -27,7 +27,7 @@ - using namespace std; - - --inline GnomeCmdPath *GnomeCmdPlainPath::get_parent() -+GnomeCmdPath *GnomeCmdPlainPath::get_parent() - { - GnomeVFSURI *t = gnome_vfs_uri_new (G_DIR_SEPARATOR_S); - GnomeVFSURI *u1 = gnome_vfs_uri_append_path (t, path); -@@ -48,7 +48,7 @@ inline GnomeCmdPath *GnomeCmdPlainPath:: - } - - --inline GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child) -+GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child) - { - GnomeVFSURI *t = gnome_vfs_uri_new (G_DIR_SEPARATOR_S); - GnomeVFSURI *u1 = gnome_vfs_uri_append_path (t, path); diff --git a/gnome-commander.spec b/gnome-commander.spec index 82dacc8..6008c35 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,7 +26,7 @@ %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 2 +%global main_release 1 %global extratag git_%{git_pull_JST} %undefine extratag %global mimeedit_rev 1958 @@ -48,7 +48,7 @@ %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.4.0 +Version: 1.4.1 # Downgrade 3 times, sorry... Epoch: 4 Release: %{fedora_rel}%{?dist} @@ -63,9 +63,6 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{versi Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch10: mimeedit-svn1958.diff -# Fix build failure on armv7hl -# src/gnome-cmd-con-device.cc:293: undefined reference to `vtable for GnomeCmdPlainPath' -Patch100: gnome-commander-1.4.0-vtable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -80,7 +77,7 @@ BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(libgnome-2.0) BuildRequires: pkgconfig(libgnomeui-2.0) -BuildRequires: pkgconfig(poppler) >= %{POPPLER_REQ} +BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} BuildRequires: pkgconfig(taglib) >= %{TAGLIB_REQ} BuildRequires: pkgconfig(unique-1.0) @@ -140,7 +137,6 @@ ansluta till FTP-servrar och SMB-nätverk. %{__cp} -p %SOURCE10 mimeedit.sh %patch10 -p0 -%patch100 -p1 -b .vtable %{__sed} -i.pylib \ -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ @@ -248,6 +244,9 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Apr 07 2014 Mamoru TASAKA - 4:1.4.1-1 +- Update to 1.4.1 + * Wed Mar 19 2014 Mamoru TASAKA - 4:1.4.0-2 - Fix build error on armv7fl about missing vtable diff --git a/sources b/sources index 1c6b977..b822ab4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7e4daf3c5ec0b7938a8adfaab20af75 gnome-commander-1.4.0.tar.xz +6362b405fdf21fc14e688f3a12ba7467 gnome-commander-1.4.1.tar.xz