From ee3c3fac931a06ead29538807c2d82e5f6427d2a Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 3 Aug 2006 03:04:56 +0000
Subject: [PATCH] Bump to 6.30

---
 .cvsignore                                |  1 +
 perl-Image-ExifTool-avoidtheworduse.patch | 22 +++++++++++-----------
 perl-Image-ExifTool.spec                  |  7 +++++--
 sources                                   |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6370e44..49e41f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ Image-ExifTool-5.89.tar.gz
 Image-ExifTool-6.09.tar.gz
 Image-ExifTool-6.15.tar.gz
 Image-ExifTool-6.26.tar.gz
+Image-ExifTool-6.30.tar.gz
diff --git a/perl-Image-ExifTool-avoidtheworduse.patch b/perl-Image-ExifTool-avoidtheworduse.patch
index 2a49526..56388f2 100644
--- a/perl-Image-ExifTool-avoidtheworduse.patch
+++ b/perl-Image-ExifTool-avoidtheworduse.patch
@@ -45,17 +45,6 @@
  while SRF6 uses standard EXIF tags.  All information other than SRF0 is
  encrypted, but thanks to Dave Coffin the decryption algorithm is known.
  
---- Image-ExifTool-6.26/lib/Image/ExifTool/MakerNotes.pm.BAD	2006-07-11 08:33:56.000000000 -0500
-+++ Image-ExifTool-6.26/lib/Image/ExifTool/MakerNotes.pm	2006-07-11 08:34:03.000000000 -0500
-@@ -570,7 +570,7 @@
-             last;
-         }
-         if ($countNeg12 > $countZero) {
--            # looks like these offsets are entry-based, so use the offsets
-+            # looks like these offsets are entry-based, so choose the offsets
-             # which have been correcting for individual entry position
-             $entryBased = 1;
-             next;   # go around again to validate entry-based offsets
 --- Image-ExifTool-6.26/lib/Image/ExifTool/MIE.pm.BAD	2006-07-11 08:38:18.000000000 -0500
 +++ Image-ExifTool-6.26/lib/Image/ExifTool/MIE.pm	2006-07-11 08:38:39.000000000 -0500
 @@ -145,7 +145,7 @@
@@ -189,3 +178,14 @@
              $dataPt = $dirData;
              $val = $offset;
              $offset = $pt+6;
+--- Image-ExifTool-6.30/lib/Image/ExifTool/MakerNotes.pm.BAD	2006-08-02 22:01:06.000000000 -0500
++++ Image-ExifTool-6.30/lib/Image/ExifTool/MakerNotes.pm	2006-08-02 22:01:14.000000000 -0500
+@@ -593,7 +593,7 @@
+          ($$valBlkAdj{MIN} == $ifdLen - 2 or $$valBlkAdj{MIN} == $ifdLen + 2)
+         ) and $$valBlkAdj{MAX} <= $$dirInfo{DirLen}-2)
+     {
+-        # looks like these offsets are entry-based, so use the offsets
++        # looks like these offsets are entry-based, so choose the offsets
+         # which have been correcting for individual entry position
+         $entryBased = 1;
+         $verbose and $exifTool->Warn("$dirName offsets are entry-based");
diff --git a/perl-Image-ExifTool.spec b/perl-Image-ExifTool.spec
index 442e3d5..8c5180c 100644
--- a/perl-Image-ExifTool.spec
+++ b/perl-Image-ExifTool.spec
@@ -1,6 +1,6 @@
 Name:		perl-Image-ExifTool
-Version:	6.26
-Release:	2%{?dist}
+Version:	6.30
+Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
 Summary:	Utility for reading and writing image meta info
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Aug  2 2006 Tom "spot" Callaway <tcallawa@redhat.com> 6.30-1
+- bump to 6.30
+ 
 * Tue Jul 11 2006 Tom "spot" Callaway <tcallawa@redhat.com> 6.26-2
 - clean up the places where "use the" shows up in the code as a workaround
 
diff --git a/sources b/sources
index 5b8f6b3..92cd11d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2f0e11d26672f4e32d90bd4caa7b6a1  Image-ExifTool-6.26.tar.gz
+e6adb104b668b59cf1e96f859b074193  Image-ExifTool-6.30.tar.gz