From 9cbe0db0a05f8240ded0ba1f0a7e3ab7fd8b6a59 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jan 20 2011 15:42:40 +0000
Subject: upstream patch fixing build against exiv2-0.21


---

diff --git a/kphotoalbum-4.1.1-exiv2_021.patch b/kphotoalbum-4.1.1-exiv2_021.patch
new file mode 100644
index 0000000..89283fd
--- /dev/null
+++ b/kphotoalbum-4.1.1-exiv2_021.patch
@@ -0,0 +1,47 @@
+--- trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:47:21	1213127
++++ trunk/extragear/graphics/kphotoalbum/Exif/Info.cpp	2011/01/09 06:50:40	1213128
+@@ -106,6 +106,28 @@
+         return res;
+ 
+     QList<const Exiv2::TagInfo*> tags;
++    std::ostringstream s;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++    while (gi->tagList_ != 0) {
++	    Exiv2::TagListFct tl     = gi->tagList_;
++	    const Exiv2::TagInfo* ti = tl();
++
++	    while (ti->tag_ != 0xFFFF) {
++		    tags << ti;
++		    ++ti;
++	    }
++        ++gi;
++    }
++
++    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
++        while ( (*it)->tag_ != 0xffff ) {
++            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
++            ++(*it);
++        }
++    }
++#else
+     tags <<
+         Exiv2::ExifTags::ifdTagList() <<
+         Exiv2::ExifTags::exifTagList() <<
+@@ -121,7 +143,6 @@
+     // Now the ugly part -- exiv2 doesn't have any way to get a list of
+     // MakerNote tags in a reasonable form, so we have to parse it from strings
+ 
+-    std::ostringstream s;
+     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
+             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
+ #if EXIV2_TEST_VERSION(0,17,0)
+@@ -130,6 +151,7 @@
+         Exiv2::ExifTags::makerTaglist( s, kind );
+ #endif
+     }
++#endif
+ 
+     // IPTC tags use yet another format...
+     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/kphotoalbum.spec b/kphotoalbum.spec
index 811efb0..a8f7e32 100644
--- a/kphotoalbum.spec
+++ b/kphotoalbum.spec
@@ -10,7 +10,10 @@ URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
 Patch100: kphotoalbum-4.1.1-docbook_fix.patch
+# http://websvn.kde.org/?view=revision&revision=1213128
+Patch101: kphotoalbum-4.1.1-exiv2_021.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
@@ -38,6 +41,7 @@ A photo album tool. Focuses on three key points:
 %setup -q 
 
 %patch100 -p1
+%patch101 -p4 -b exiv2_021
 
 
 %build