[bookkeeper] Fix FTBFS

[Michal Srb]

commit 2a37db882e0bc2847bfe30276d877e9fb1d32b6b
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Nov 20 15:17:08 2014 +0100

    Fix FTBFS

 bookkeeper-4.2.1-guava-17.patch |   13 +++++++++++++
 bookkeeper.spec                 |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/bookkeeper-4.2.1-guava-17.patch b/bookkeeper-4.2.1-guava-17.patch
new file mode 100644
index 0000000..c9fa2a8
--- /dev/null
+++ b/bookkeeper-4.2.1-guava-17.patch
@@ -0,0 +1,13 @@
+diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java
+index b3e661d..3f9bf81 100644
+--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java
++++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/Value.java
+@@ -90,7 +90,7 @@ public class Value {
+         HashFunction hf = Hashing.murmur3_32();
+         Hasher hc = hf.newHasher();
+         for (String key : fields.keySet()) {
+-            hc.putString(key);
++            hc.putUnencodedChars(key);
+         }
+         return hc.hash().asInt();
+     }
diff --git a/bookkeeper.spec b/bookkeeper.spec
index e62501b..2a82be3 100644
--- a/bookkeeper.spec
+++ b/bookkeeper.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 Name:          bookkeeper
 Version:       4.2.1
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       Apache BookKeeper sub-project of ZooKeeper
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -21,6 +21,7 @@ Patch2:        bookkeeper-4.2.1-test-add-PIE-and-RELRO.patch
 Patch3:        bookkeeper-4.2.1-boost153.patch
 Patch4:        bookkeeper-4.2.1-jline2.patch
 Patch5:        bookkeeper-4.2.1-netty.patch
+Patch6:        bookkeeper-4.2.1-guava-17.patch
 
 BuildRequires: java-devel
 
@@ -111,6 +112,7 @@ This package contains javadoc for %{name}.
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bookkeeper-server
@@ -198,6 +200,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Nov 20 2014 Michal Srb <msrb at redhat.com> - 4.2.1-12
+- Fix FTBFS
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild