i9cf
Mamoru TASAKA 6 years ago
parent 5acacd817f
commit 6a5325b58b

1
.gitignore vendored

@ -30,3 +30,4 @@ gnome-commander-1.2.8.7.tar.bz2
/gnome-commander-1.8.1.tar.xz /gnome-commander-1.8.1.tar.xz
/gnome-commander-1.10.0.tar.xz /gnome-commander-1.10.0.tar.xz
/gnome-commander-1.10.1.tar.xz /gnome-commander-1.10.1.tar.xz
/gnome-commander-1.10.2.tar.xz

@ -1,28 +0,0 @@
From 1f98b4a87df3d68b8dd6a2eef24521db7a4d5c75 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Wed, 15 May 2019 18:13:29 +0900
Subject: [PATCH] Fix compilation error with exiv2 0.27.1
Due to the change in https://github.com/Exiv2/exiv2/commit/71498411c19e6b97a24245b5a1a22063c76a972a ,
gnome-cmd-tags-exiv2.cc does not compile with exiv2 0.27.1 .
This commit is to fix the error.
---
src/tags/gnome-cmd-tags-exiv2.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc
index 807e6f43..e4b269f3 100644
--- a/src/tags/gnome-cmd-tags-exiv2.cc
+++ b/src/tags/gnome-cmd-tags-exiv2.cc
@@ -33,6 +33,7 @@
#ifdef HAVE_EXIV2
#include <exiv2/exif.hpp>
#include <exiv2/image.hpp>
+#include <exiv2/error.hpp>
#endif
using namespace std;
--
2.21.0

@ -53,7 +53,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.10.1 Version: 1.10.2
# Downgrade 3 times, sorry... # Downgrade 3 times, sorry...
Epoch: 4 Epoch: 4
Release: %{fedora_rel}%{?dist} Release: %{fedora_rel}%{?dist}
@ -68,8 +68,6 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.10/%{name}-%{vers
Source1: gnome-commander.sh Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch1: gnome-commander-1.6.0-path-fedora-specific.patch Patch1: gnome-commander-1.6.0-path-fedora-specific.patch
# https://gitlab.gnome.org/GNOME/gnome-commander/merge_requests/4
Patch101: 0001-Fix-compilation-error-with-exiv2-0.27.1.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -140,7 +138,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
%patch101 -p1 -b .exiv_new
%if 0%{use_autotool} > 0 %if 0%{use_autotool} > 0
( export NOCONFIGURE=1 ; sh autogen.sh ) ( export NOCONFIGURE=1 ; sh autogen.sh )
@ -265,6 +262,9 @@ desktop-file-install \
%{_datadir}/pixmaps/%{name}/ %{_datadir}/pixmaps/%{name}/
%changelog %changelog
* Tue May 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.2-1
- 1.10.2
* Thu May 16 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.1-1 * Thu May 16 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.10.1-1
- 1.10.1 - 1.10.1

@ -1 +1 @@
SHA512 (gnome-commander-1.10.1.tar.xz) = b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d SHA512 (gnome-commander-1.10.2.tar.xz) = 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad

Loading…
Cancel
Save