[avro] Add a patch to build with OpenJDK 8

Ricardo Arguello ricardo at fedoraproject.org
Mon Mar 31 02:39:20 UTC 2014


commit 0536830b782b82a51d09113eec1ac79e4655667d
Author: Ricardo Arguello <ricardo at fedoraproject.org>
Date:   Mon Mar 31 02:38:59 2014 +0000

    Add a patch to build with OpenJDK 8

 avro-jdk8.patch |   20 ++++++++++++++++++++
 avro.spec       |   11 ++++++++---
 sources         |    2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/avro-jdk8.patch b/avro-jdk8.patch
new file mode 100644
index 0000000..6b3b21f
--- /dev/null
+++ b/avro-jdk8.patch
@@ -0,0 +1,20 @@
+--- a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2013-07-09 21:57:43.894166000 +0000
++++ b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2014-03-31 02:01:00.407611714 +0000
+@@ -101,7 +101,7 @@
+     if (fields == null) {                           // cache miss
+       fields = new TFieldIdEnum[s.getFields().size()];
+       Class c = r.getClass();
+-      for (TFieldIdEnum f : FieldMetaData.getStructMetaDataMap(c).keySet())
++      for (TFieldIdEnum f : FieldMetaData.getStructMetaDataMap((Class<? extends TBase>) c).keySet())
+         fields[s.getField(f.getFieldName()).pos()] = f;
+       fieldCache.put(s, fields);                  // update cache
+     }
+@@ -170,7 +170,7 @@
+                                        Throwable.class.isAssignableFrom(c));
+           List<Field> fields = new ArrayList<Field>();
+           for (FieldMetaData f :
+-                 FieldMetaData.getStructMetaDataMap(c).values()) {
++                 FieldMetaData.getStructMetaDataMap((Class<? extends TBase>) c).values()) {
+             Schema s = getSchema(f.valueMetaData);
+             if (f.requirementType == TFieldRequirementType.OPTIONAL
+                 && (s.getType() != Schema.Type.UNION))
diff --git a/avro.spec b/avro.spec
index bbf6e13..41d4086 100644
--- a/avro.spec
+++ b/avro.spec
@@ -1,17 +1,18 @@
 Name:             avro
 Version:          1.7.5
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Data serialization system
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://avro.apache.org
 
 # svn export http://svn.apache.org/repos/asf/avro/tags/release-1.7.5/ avro-1.7.5
-# find avro-1.7.5/ -name '*.jar' -or -name '*.dll' -delete
-# tar cafJ avro-1.7.5-CLEAN.tar.xz avro-1.7.5
+# find avro-1.7.5/ -name '*.jar' -delete -or -name '*.dll' -delete
+# tar cJf avro-1.7.5-CLEAN.tar.xz avro-1.7.5
 Source0:          avro-%{version}-CLEAN.tar.xz
 Patch0:           avro-ipc-changes-for-jetty-upgrade.patch
 Patch1:           Support-for-hadoop-2.2.0.patch
+Patch2:           avro-jdk8.patch
 
 BuildArch:        noarch
 
@@ -107,6 +108,7 @@ This package contains the API documentation for %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # junit, versions, and no tools or archetypes module
 sed -i "s|<hadoop2.version>2.0.1-alpha</hadoop2.version>|<hadoop2.version>2.0.5-alpha</hadoop2.version>|" lang/java/pom.xml
@@ -168,6 +170,9 @@ sed -i "s|>3.4.0.Final<|>3<|" lang/java/pom.xml
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Sun Mar 30 2014 Ricardo Aguello <ricardo at fedoraproject.org> - 1.7.5-6
+- Add a patch to build with OpenJDK 8
+
 * Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 1.7.5-5
 - Use Requires: java-headless rebuild (#1067528)
 
diff --git a/sources b/sources
index 8bd3edd..032ccb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b59deb4df828e98860ff51e39688187f  avro-1.7.5-CLEAN.tar.xz
+9dc84068fc1f4315fb95c0f366ed4f21  avro-1.7.5-CLEAN.tar.xz


More information about the scm-commits mailing list