From fcbf7643dfe3d590ed2bafd4f7fd8a8bd9efbde4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Fri, 5 Apr 2013 08:14:20 +0200
Subject: [PATCH] - updated to 1.1.4 - removed obsolete librsvg patch - build
 with OpenEXR 2.0

---
 darktable.spec        | 13 +++++++------
 librsvg-headers.patch | 11 -----------
 openexr2.patch        | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 librsvg-headers.patch
 create mode 100644 openexr2.patch

diff --git a/darktable.spec b/darktable.spec
index f05af79..3d71831 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -5,18 +5,18 @@
 Summary:	darktable is a virtual lighttable and darkroom for photographers
 Summary(pl.UTF-8):	darktable to wirtualny podświetlany stół i ciemnia dla fotografów
 Name:		darktable
-Version:	1.0.5
-Release:	3
+Version:	1.1.4
+Release:	1
 License:	GPL v3
 Group:		X11/Applications/Graphics
-Source0:	http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.gz
-# Source0-md5:	9ad88a1a6b9761fce28c8073d8f47941
+Source0:	http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.xz
+# Source0-md5:	49e376ca4b88f5351acacef177285c45
 Patch0:		cmake-glib.patch
-Patch1:		librsvg-headers.patch
+Patch1:		openexr2.patch
 URL:		http://darktable.sourceforge.net/
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel
-BuildRequires:	OpenEXR-devel >= 1.6
+BuildRequires:	OpenEXR-devel >= 2.0
 BuildRequires:	SDL-devel
 BuildRequires:	cairo-devel
 BuildRequires:	cmake
@@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/README doc/AUTHORS doc/LICENSE doc/TRANSLATORS
 %attr(755,root,root) %{_bindir}/darktable
+%attr(755,root,root) %{_bindir}/darktable-cli
 %attr(755,root,root) %{_bindir}/darktable-cltest
 %attr(755,root,root) %{_bindir}/darktable-viewer
 %{_datadir}/darktable
diff --git a/librsvg-headers.patch b/librsvg-headers.patch
deleted file mode 100644
index bd11baa..0000000
--- a/librsvg-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- darktable-1.0.5/src/iop/watermark.c~	2012-07-21 13:44:08.000000000 +0300
-+++ darktable-1.0.5/src/iop/watermark.c	2012-09-01 23:32:58.391794753 +0300
-@@ -38,7 +38,7 @@
- #include <inttypes.h>
- 
- #include <librsvg/rsvg.h>
--#include <librsvg/rsvg-cairo.h>
-+#include <cairo.h>
- 
- #include "common/metadata.h"
- #include "common/utility.h"
diff --git a/openexr2.patch b/openexr2.patch
new file mode 100644
index 0000000..7ab4daf
--- /dev/null
+++ b/openexr2.patch
@@ -0,0 +1,20 @@
+--- darktable-1.1.4/src/common/imageio_exr.hh~	2013-03-09 22:48:35.000000000 +0100
++++ darktable-1.1.4/src/common/imageio_exr.hh	2013-04-05 08:11:04.499777789 +0200
+@@ -31,7 +31,7 @@
+ #include <OpenEXR/ImfStandardAttributes.h>
+ 
+ // this stores our exif data as a blob.
+-namespace Imf
++namespace Imf_2_0
+ {
+ class Blob
+ {
+@@ -54,7 +54,7 @@
+ };
+ 
+ 
+-typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute;
++typedef Imf_2_0::TypedAttribute<Imf_2_0::Blob> BlobAttribute;
+ template <> const char *BlobAttribute::staticTypeName()
+ {
+   return "blob";
-- 
2.43.0