- fix exiv2 version detection

- rel 15

diff --git a/exiv2-version.patch b/exiv2-version.patch
new file mode 100644 (file)
index 0000000..18f9844
--- /dev/null
+++ b/exiv2-version.patch
@@ -0,0 +1,30 @@
+--- rawstudio-2.0/librawstudio/rs-exif.cc~     2011-02-15 18:28:05.000000000 +0100
++++ rawstudio-2.0/librawstudio/rs-exif.cc      2019-02-11 21:02:25.572143480 +0100
+@@ -21,6 +21,7 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
+ #include "rs-exif.h"
+ #include <assert.h>
+ #include "rs-library.h"
+--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp~       2019-02-11 21:06:38.000000000 +0100
++++ rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp        2019-02-11 21:10:56.249335153 +0100
+@@ -22,6 +22,7 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
+ #include <assert.h>
+ #include "exiv2-colorspace.h"
+ #include <math.h>
+--- rawstudio-2.0/plugins/meta-exiv2/exiv2-metadata.cpp~       2011-02-27 00:13:39.000000000 +0100
++++ rawstudio-2.0/plugins/meta-exiv2/exiv2-metadata.cpp        2019-02-11 21:13:17.619365687 +0100
+@@ -22,6 +22,7 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
+ #include <assert.h>
+ #include "exiv2-metadata.h"
+ #include <math.h>

diff --git a/rawstudio.spec b/rawstudio.spec
index e7cb81df803158551ca562a5debfce517e7382db..c7a27b8cf33c0f8a568c1646000df5c098660ad0 100644 (file)
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -2,7 +2,7 @@ Summary:        RAW-image converter written using GTK+
 Summary(pl.UTF-8):     Konwerter obrazów RAW napisany z użyciem GTK+
 Name:          rawstudio
 Version:       2.0
-%define        rel     14
+%define        rel     15
 # Keep it for future snapshots because releases are not-so-frequent:
 %define        svnrev  1624
 %define        snap    20080130
@@ -18,6 +18,7 @@ Source0:      http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 Patch0:                %{name}-libpng15.patch
 Patch1:                am.patch
 Patch2:                lensfun.patch
+Patch3:                exiv2-version.patch
 URL:           http://rawstudio.org/
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: autoconf >= 2.59
@@ -39,6 +40,7 @@ BuildRequires:        openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: sqlite3-devel >= 3
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: zstd-devel
 Requires:      gtk+2 >= 2:2.8.0
 Requires:      libxml2 >= 2.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +66,7 @@ Header files for %{name}.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 export CXXFLAGS="%{rpmcxxflags} -Wno-narrowing"