[darktable] exiv2 headers bug #666887

[madko]

commit df2e5c42dc01157edc37ccd626de188444ff6412
Author: Edouard <edouard at totem.(none)>
Date:   Mon Jan 3 22:51:59 2011 +0100

    exiv2 headers bug #666887

 darktable-0.7-exiv_new_umbrella_header.patch |   16 ++++++++++++++++
 darktable.spec                               |    8 +++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/darktable-0.7-exiv_new_umbrella_header.patch b/darktable-0.7-exiv_new_umbrella_header.patch
new file mode 100644
index 0000000..4d298a7
--- /dev/null
+++ b/darktable-0.7-exiv_new_umbrella_header.patch
@@ -0,0 +1,16 @@
+diff -Naur darktable-0.7.orig/src/common/exif.cc darktable-0.7/src/common/exif.cc
+--- darktable-0.7.orig/src/common/exif.cc 2010-11-20 12:35:27.000000000 +0100
++++ darktable-0.7/src/common/exif.cc 2011-01-03 19:05:34.242131001 +0100
+@@ -29,11 +29,7 @@
+ #include "common/imageio.h"
+ }
+ // #include <libexif/exif-data.h>
+-#include <exiv2/xmp.hpp>
+-#include <exiv2/error.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/canonmn.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <sqlite3.h>
+ #include <iostream>
+ #include <fstream>
diff --git a/darktable.spec b/darktable.spec
index 13f6f21..e1774f6 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -3,7 +3,7 @@
 
 Name:		darktable
 Version:	0.7.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Utility to organize and develop raw images
 
 Group:		Applications/Multimedia
@@ -32,6 +32,8 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gegl-devel
 %endif
 
+Patch:	darktable-0.7-exiv_new_umbrella_header.patch
+
 %description
 Darktable is a virtual light-table and darkroom for photographers:
 it manages your digital negatives in a database and lets you view them
@@ -41,6 +43,7 @@ It also enables you to develop raw images and enhance them.
 
 %prep
 %setup -q
+%patch -p1 -b exiv_new_umbrella_header.rej
 
 
 %build
@@ -101,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Jan 03 2010 Edouard Bourguignon <madko at linuxed.net> - 0.7.1-3
+- Change exiv2 headers to use the new umbrella header (#666887)
+
 * Sat Jan 01 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.7.1-2
 - rebuild (exiv2)