From 6a5325b58bdce512372ac4b302b130249e0a5614 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 May 2019 15:51:51 +0900 Subject: [PATCH] 1.10.2 --- .gitignore | 1 + ...-compilation-error-with-exiv2-0.27.1.patch | 28 ------------------- gnome-commander.spec | 8 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 0001-Fix-compilation-error-with-exiv2-0.27.1.patch diff --git a/.gitignore b/.gitignore index 9e7d1ae..0c5530a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.8.1.tar.xz /gnome-commander-1.10.0.tar.xz /gnome-commander-1.10.1.tar.xz +/gnome-commander-1.10.2.tar.xz diff --git a/0001-Fix-compilation-error-with-exiv2-0.27.1.patch b/0001-Fix-compilation-error-with-exiv2-0.27.1.patch deleted file mode 100644 index 9b181e9..0000000 --- a/0001-Fix-compilation-error-with-exiv2-0.27.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1f98b4a87df3d68b8dd6a2eef24521db7a4d5c75 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -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 - #include -+#include - #endif - - using namespace std; --- -2.21.0 - diff --git a/gnome-commander.spec b/gnome-commander.spec index 647eaea..ff5545f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -53,7 +53,7 @@ %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.10.1 +Version: 1.10.2 # Downgrade 3 times, sorry... Epoch: 4 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 Source10: mimeedit-svn%{mimeedit_rev}.sh 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++ @@ -140,7 +138,6 @@ ansluta till FTP-servrar och SMB-nätverk. #%%setup -q -n %{name}-%{githash} %patch1 -p1 -b .path -%patch101 -p1 -b .exiv_new %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -265,6 +262,9 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Tue May 21 2019 Mamoru TASAKA - 4:1.10.2-1 +- 1.10.2 + * Thu May 16 2019 Mamoru TASAKA - 4:1.10.1-1 - 1.10.1 diff --git a/sources b/sources index f7e1e0e..e4c996d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.10.1.tar.xz) = b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d +SHA512 (gnome-commander-1.10.2.tar.xz) = 7a411ca6f604771445119cb2b9d14f7f5d91622d28975e92ae5f5da3fc4f76fe51cca0de3712377ef95064879089c1c723dce9a824e5784cfcd484b869702dad