From 0076c9afbd5a484cb65a7c568cc53284bd183053 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 27 2011 13:20:04 +0000
Subject: New Tamron 70-300 mm lens improperly recognized (#708403)


---

diff --git a/exiv2-0.21-Tamron70-300.patch b/exiv2-0.21-Tamron70-300.patch
new file mode 100644
index 0000000..9642fd5
--- /dev/null
+++ b/exiv2-0.21-Tamron70-300.patch
@@ -0,0 +1,18 @@
+--- a/src/canonmn.cpp	2011-02-13 15:39:15.000000000 +0100
++++ b/src/canonmn.cpp	2011-05-25 19:58:40.420111647 +0200
+@@ -549,6 +549,7 @@
+         { 154, "Canon EF 20mm f/2.8 USM"                                    },
+         { 155, "Canon EF 85mm f/1.8 USM"                                    },
+         { 156, "Canon EF 28-105mm f/3.5-4.5 USM"                            },
++        { 156, "Tamron SP AF 70-300mm F4-5.6 Di VC USD"                     }, // 1
+         { 160, "Canon EF 20-35mm f/3.5-4.5 USM"                             }, // 0
+         { 160, "Tamron AF 19-35mm f/3.5-4.5"                                }, // 1
+         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
+@@ -671,6 +672,7 @@
+         { 150, printCsLensByFocalLength },
+         { 152, printCsLensByFocalLength },
+         { 153, printCsLensByFocalLength },
++	{ 156, printCsLensByFocalLength },
+         { 161, printCsLensByFocalLength },
+         { 169, printCsLensByFocalLength },
+         { 173, printCsLensByFocalLength }, // works partly
diff --git a/exiv2.spec b/exiv2.spec
index b7bf072..56a5646 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -2,7 +2,7 @@
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.21.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstream patches
 # http://dev.exiv2.org/issues/769
 Patch100: exiv2-0.21.1-tiffcomposite.patch
+# http://dev.exiv2.org/issues/772
+Patch101: http://dev.exiv2.org/attachments/download/258/exiv2-0.21-Tamron70-300.patch
 
 BuildRequires: chrpath
 BuildRequires: expat-devel
@@ -60,6 +62,7 @@ methods for Exif thumbnails, classes to access Ifd and so on.
 pushd src
 %patch100 -p0 -b .tiffcomposite
 popd
+%patch101 -p1 -b .Tamron70-300
 
 mkdir doc/html
 
@@ -124,6 +127,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 27 2011 Rex Dieter <rdieter@fedoraproject.org> 0.21.1-3
+- New Tamron 70-300 mm lens improperly recognized (#708403)
+
 * Mon Sep 26 2011 Rex Dieter <rdieter@fedoraproject.org> 0.21.1-2
 - gthumb crashes because of bug in exiv2 0.21.1 (#741429)