[metadata-extractor] Fix encoding errors

[musuruan]

commit cd302e4f92f3cc579b839558b0cc90d3dd85c3fd
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sun Jan 29 18:52:47 2012 +0100

    Fix encoding errors

 metadata-extractor-2.3.1-encoding.patch |   68 +++++++++++++++++++++++++++++++
 metadata-extractor.spec                 |   13 +++++-
 2 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/metadata-extractor-2.3.1-encoding.patch b/metadata-extractor-2.3.1-encoding.patch
new file mode 100644
index 0000000..89356fc
--- /dev/null
+++ b/metadata-extractor-2.3.1-encoding.patch
@@ -0,0 +1,68 @@
+--- metadata-extractor-r11/src/com/drew/metadata/exif/NikonType2MakernoteDirectory.java	2012-01-29 15:15:44.837106259 +0100
++++ metadata-extractor-r16/src/com/drew/metadata/exif/NikonType2MakernoteDirectory.java	2012-01-29 15:23:22.994903922 +0100
+@@ -8,7 +8,7 @@
+  * wider community, please send me a copy and I'll post it on my site.
+  *
+  * If you make use of this code, I'd appreciate hearing about it.
+- *   drew at drewnoakes.com
++ *   metadata_extractor [at] drewnoakes [dot] com
+  * Latest version of this software kept at
+  *   http://drewnoakes.com/
+  *
+@@ -23,7 +23,7 @@
+ import java.util.HashMap;
+ 
+ /**
+- * Contains values specific to Nikon cameras.  Type-2 applies to the E990 and D-series cameras such as the E990, D1,
++ * Describes tags specific to Nikon (type 2) cameras.  Type-2 applies to the E990 and D-series cameras such as the E990, D1,
+  * D70 and D100.
+  *
+  * Thanks to Fabrizio Giudici for publishing his reverse-engineering of the D100 makernote data.
+@@ -149,7 +149,6 @@
+ 
+     /**
+      * Values observed
+-     * - î

+      * - 0,1,c,0 (hex)
+      */
+     public static final int TAG_NIKON_TYPE2_UNKNOWN_2 = 0x000E;
+@@ -295,7 +294,7 @@
+     /**
+      * Values observed
+      * - 48,1,c,0 (hex) (D100)
+-     * - @

++     * - @ <hex>
+      */
+     public static final int TAG_NIKON_TYPE2_UNKNOWN_8 = 0x008B;
+ 
+@@ -326,7 +325,7 @@
+ 
+     /**
+      * Values observed
+-     * - 0100)
++     * - 0100 <hex>
+      * - 0103 (D70)
+      * - 0100 (D1X)
+      */
+@@ -348,16 +347,16 @@
+ 
+     /**
+      * Values observed
+-     * - 0100
'
~e
3

+-     * - 0103

++     * - 0100 <hex>
++     * - 0103 <hex>
+      */
+     public static final int TAG_NIKON_TYPE2_UNKNOWN_12 = 0x0097;
+ 
+     /**
+      * Values observed
+-     * - 0100fht at 7b,4x,D"Y
+-     * - 01015
+-     * - 0100w\cH+D$$h$î5Q (D1X)
++     * - 0100 <hex>
++     * - 0101 <hex>
++     * - 0100 <hex> (D1X)
+      * - 30,31,30,30,0,0,b,48,7c,7c,24,24,5,15,24,0,0,0,0,0 (hex) (D100)
+      */
+     public static final int TAG_NIKON_TYPE2_UNKNOWN_13 = 0x0098;
diff --git a/metadata-extractor.spec b/metadata-extractor.spec
index 31728cb..7f3e154 100644
--- a/metadata-extractor.spec
+++ b/metadata-extractor.spec
@@ -1,6 +1,6 @@
 Name:           metadata-extractor
 Version:        2.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        JPEG metadata extraction framework
 
 Group:          Development/Libraries
@@ -11,6 +11,9 @@ Source0:        http://www.drewnoakes.com/code/exif/releases/%{name}-%{version}-
 # Patch provided by Gabriel Ebner to remove all references to the 
 # com.sun classes. Package builds with a free java implementation now.
 Patch0:         %{name}-2.3.1-nosun.patch
+# Patch from upstream svn r16
+# Fix encoding errors
+Patch1:         %{name}-2.3.1-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,6 +45,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
 
 # Remove pre-built JAR and class files
 find -name '*.jar' -exec rm -f '{}' \;
@@ -53,9 +57,13 @@ build-jar-repository -s -p Libraries junit
 # Fix end-of-line encoding
 sed -i 's/\r//' ChangeLog.txt
 
+# Delete test directories
+find . -type d -name test -print | xargs rm -rf
+
 # Disable junit tests
 sed -i 's/depends="clean, compile, test"/depends="clean, compile"/' build.xml
 
+
 %build
 ant dist-binaries javadoc
 
@@ -101,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 29 2012 Andrea Musuruane <musuruan at gmail.com> 2.3.1-8
+- Fix encoding errors
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild