diff --git a/spark.spec b/spark.spec index 863a539..3e37c7d 100644 --- a/spark.spec +++ b/spark.spec @@ -28,8 +28,6 @@ Patch1: spark-v0.9.0-0002-use-sbt-0.13.1.patch Patch2: spark-v0.9.0-0003-Removed-sbt-plugins.patch Patch3: spark-v0.9.0-0004-removed-examples.patch Patch4: spark-v0.9.0-0005-Removed-code-depending-on-Kryo.patch -Patch5: spark-v0.9.0-0006-Remove-functionality-depending-on-stream-lib.patch -Patch6: spark-v0.9.0-0007-Removed-mesos.patch Patch7: spark-v0.9.0-0008-remove-unavailable-and-unnecessary-deps.patch Patch8: spark-v0.9.0-0009-use-Jetty-8.patch Patch9: spark-v0.9.0-0010-use-Akka-2.3.0-RC2.patch @@ -55,6 +53,9 @@ Requires: mvn(org.json4s:json4s-jackson_%{scala_version}) BuildRequires: mvn(com.thoughtworks.paranamer:paranamer) Requires: mvn(com.thoughtworks.paranamer:paranamer) +BuildRequires: mvn(com.clearspring.analytics:stream) +BuildRequires: mesos-java + BuildRequires: mvn(com.codahale.metrics:metrics-core) BuildRequires: mvn(com.codahale.metrics:metrics-ganglia) BuildRequires: mvn(com.codahale.metrics:metrics-graphite) @@ -129,8 +130,6 @@ Javadoc for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -154,15 +153,9 @@ rm ./examples/src/main/scala/org/apache/spark/examples/SparkALS.scala # remove chill dependency (not available yet) sed -i -e '/com.twitter.*chill/d' project/SparkBuild.scala -# remove stream-lib dependency (not available yet) -sed -i -e '/com.clearspring.*stream/d' project/SparkBuild.scala - # remove avro because it's only used for flume (which we don't build) sed -i -e '/org.apache.*avro/d' project/SparkBuild.scala -# remove mesos dependency (java support not available yet) -sed -i -e '/org[.]apache.*mesos/d' project/SparkBuild.scala - # remove all test deps for now sed -i -e '/%[[:space:]]*"test"/d' project/SparkBuild.scala