diff --git a/zookeeper-3.4.6-ivy-build.patch b/zookeeper-3.4.6-ivy-build.patch
index 09c1e97..075cbfa 100644
--- a/zookeeper-3.4.6-ivy-build.patch
+++ b/zookeeper-3.4.6-ivy-build.patch
@@ -25,9 +25,23 @@ index 442d52e..bc1f4a2 100644
  
      <target name="ivy-taskdef" unless="ivy.initialized">
 diff --git a/ivy.xml b/ivy.xml
-index 561832a..0d9e2ed 100644
+index 561832a..93176d5 100644
 --- a/ivy.xml
 +++ b/ivy.xml
+@@ -46,10 +46,10 @@
+     <dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
+     <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->default"/>
+     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
+-    <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
+-    <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
++    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="default"/>
++    <dependency org="jline" name="jline" rev="1.0" transitive="false" conf="default"/>
+ 
+-    <dependency org="io.netty" name="netty" conf="default" rev="3.7.0.Final">
++    <dependency org="io.netty" name="netty" conf="default" rev="3.6.6.Final">
+       <artifact name="netty" type="jar" conf="default"/>
+     </dependency>
+ 
 @@ -58,12 +58,12 @@
      <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
       <dependency org="org.mockito" name="mockito-all" rev="1.8.2"
@@ -36,7 +50,8 @@ index 561832a..0d9e2ed 100644
 +    <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.6"
                  conf="test->default"/>
  
-     <dependency org="jdiff" name="jdiff" rev="1.0.9"
+-    <dependency org="jdiff" name="jdiff" rev="1.0.9"
++    <dependency org="jdiff" name="jdiff" rev="1.1.1"
                  conf="jdiff->default"/>
 -    <dependency org="xerces" name="xerces" rev="1.4.4"
 +    <dependency org="xerces" name="xercesImpl" rev="1.4.4"
@@ -44,7 +59,7 @@ index 561832a..0d9e2ed 100644
  
      <dependency org="org.apache.rat" name="apache-rat-tasks" 
 diff --git a/ivysettings.xml b/ivysettings.xml
-index 52cfa52..f207811 100644
+index 52cfa52..595dd4c 100644
 --- a/ivysettings.xml
 +++ b/ivysettings.xml
 @@ -17,29 +17,14 @@
@@ -62,7 +77,7 @@ index 52cfa52..f207811 100644
 -  <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
    <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
    <settings defaultResolver="default"/>
-+  <typedef name="xmvn" classname="org.fedoraproject.maven.connector.ivy.IvyResolver"/>
++  <typedef name="xmvn" classname="org.fedoraproject.xmvn.connector.ivy.IvyResolver"/>
    <resolvers>
 -    <ibiblio name="maven2" root="${repo.maven.org}"
 -      pattern="${maven2.pattern.ext}" m2compatible="true"/>
@@ -119,3 +134,472 @@ index 7f7ba4f..701dfea 100644
  
    <fileset id="contribfileset" dir=".">
      <include name="${contribfilesetincludes}"/>
+diff --git a/src/contrib/rest/build.xml b/src/contrib/rest/build.xml
+deleted file mode 100644
+index 649dff7..0000000
+--- a/src/contrib/rest/build.xml
++++ /dev/null
+@@ -1,167 +0,0 @@
+-<?xml version="1.0"?>
+-
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<project name="rest" default="jar">
+-  <import file="../build-contrib.xml"/>
+-
+-	<property name="test.build.dir" value="${build.test}" />
+-    <property name="test.src.dir" value="src/test"/>
+-    <property name="test.log.dir" value="${test.build.dir}/logs" />
+-    <property name="test.data.dir" value="${test.build.dir}/data" />
+-    <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
+-    <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
+-    <property name="test.output" value="no" />
+-    <property name="test.timeout" value="900000" />
+-    <property name="test.junit.output.format" value="plain" />
+-    <property name="test.junit.fork.mode" value="perTest" />
+-    <property name="test.junit.printsummary" value="yes" />
+-    <property name="test.junit.haltonfailure" value="no" />
+-    <property name="test.junit.maxmem" value="512m" />
+-
+-    <!-- ====================================================== -->
+-    <!-- Macro definitions                                      -->
+-    <!-- ====================================================== -->
+-    <macrodef name="macro_tar" description="Worker Macro for tar">
+-      <attribute name="param.destfile"/>
+-      <element name="param.listofitems"/>
+-      <sequential>
+-        <tar compression="gzip" longfile="gnu"
+-             destfile="@{param.destfile}">
+-          <param.listofitems/>
+-        </tar>
+-      </sequential>
+-    </macrodef>
+-
+-  <target name="setjarname">
+-    <property name="jarname"
+-              value="${build.dir}/zookeeper-${version}-${name}.jar"/>
+-  </target>
+-
+-  <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
+-
+-  <target name="test"
+-          depends="compile-test,test-init,test-category,test-start,junit.run,test-stop" />
+-
+-	<target name="compile-test" depends="ivy-retrieve-test,compile">
+-  		<property name="target.jdk" value="${ant.java.version}" />	
+-		<property name="src.test.local" location="${basedir}/src/test" />
+-		<mkdir dir="${build.test}"/>
+-		<javac srcdir="${src.test.local}" 
+-			destdir="${build.test}" 
+-			target="${target.jdk}" 
+-			debug="on" >
+-			<classpath refid="classpath" />
+-		</javac>
+-	</target>
+-	
+-    <target name="test-init" depends="jar,compile-test">
+-        <delete dir="${test.log.dir}" />
+-        <delete dir="${test.tmp.dir}" />
+-        <delete dir="${test.data.dir}" />
+-        <mkdir dir="${test.log.dir}" />
+-        <mkdir dir="${test.tmp.dir}" />
+-        <mkdir dir="${test.data.dir}" />
+-    </target>
+-
+-    <target name="test-start">
+-      <exec executable="${test.src.dir}/zkServer.sh">
+-        <arg value="startClean"/>
+-      </exec>
+-    </target>
+-
+-    <target name="test-stop">
+-      <exec executable="${test.src.dir}/zkServer.sh">
+-        <arg value="stop"/>
+-      </exec>
+-    </target>
+-
+-	<target name="test-category">
+-         <property name="test.category" value=""/>
+-    </target>
+-
+-	<target name="junit.run">
+-		<echo message="${test.src.dir}" />
+-        <junit showoutput="${test.output}"
+-               printsummary="${test.junit.printsummary}"
+-               haltonfailure="${test.junit.haltonfailure}"
+-               fork="yes"
+-               forkmode="${test.junit.fork.mode}"
+-               maxmemory="${test.junit.maxmem}"
+-               dir="${basedir}" timeout="${test.timeout}"
+-               errorProperty="tests.failed" failureProperty="tests.failed">
+-          <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
+-          <sysproperty key="test.data.dir" value="${test.data.dir}" />
+-          <sysproperty key="log4j.configuration"
+-                    value="file:${basedir}/conf/log4j.properties" />
+-          <classpath refid="classpath"/>
+-          <classpath>
+-             <pathelement path="${build.test}" />
+-          </classpath>
+-          <formatter type="${test.junit.output.format}" />
+-          <batchtest todir="${test.log.dir}" unless="testcase">
+-              <fileset dir="${test.src.dir}"
+-                     includes="**/*${test.category}Test.java"/>
+-          </batchtest>
+-          <batchtest todir="${test.log.dir}" if="testcase">
+-              <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
+-          </batchtest>
+-       </junit>
+-       <fail if="tests.failed">Tests failed!</fail>
+-    </target>
+-
+-  <target name="jar" depends="checkMainCompiled, setjarname, compile">
+-    <echo message="contrib: ${name}"/>
+-    <jar jarfile="${jarname}">
+-      <fileset file="${zk.root}/LICENSE.txt" />
+-      <fileset dir="${build.classes}"/>
+-      <fileset dir="${build.test}"/>
+-    </jar>
+-  </target>
+-
+-  <target name="run" depends="jar">
+-    <echo message="contrib: ${name}"/>
+-    <java classname="org.apache.zookeeper.server.jersey.RestMain" fork="true">
+-      <classpath>
+-        <pathelement path="${jarname}" />
+-        <fileset dir="${build.dir}/lib" includes="*.jar"/>
+-        <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
+-        <pathelement path="${zk.root}/src/contrib/${name}/conf" />
+-        <fileset dir="${zk.root}/src/java/lib">
+-          <include name="**/*.jar" />
+-        </fileset>
+-      </classpath>
+-    </java>
+-  </target>
+-
+-  <target name="tar" depends="clean, jar">
+-    <echo message="building tar.gz: ${name}" />
+-    <macro_tar param.destfile="${build.dir}/zookeeper-${version}-${name}.tar.gz">
+-      <param.listofitems>
+-        <tarfileset dir="${build.dir}/lib" prefix="lib" includes="**/*.jar" />
+-        <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
+-        <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
+-        <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
+-        <tarfileset dir="${zk.root}/src/java/lib" prefix="lib" includes="**/*.jar" />
+-        <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
+-      </param.listofitems>
+-    </macro_tar>
+-  </target>
+-
+-</project>
+-
+diff --git a/src/contrib/rest/ivy.xml b/src/contrib/rest/ivy.xml
+deleted file mode 100644
+index 903d390..0000000
+--- a/src/contrib/rest/ivy.xml
++++ /dev/null
+@@ -1,48 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<ivy-module version="2.0"
+-            xmlns:e="http://ant.apache.org/ivy/extra">
+-
+-  <info organisation="org.apache.zookeeper"
+-        module="${name}" revision="${version}">
+-    <license name="Apache 2.0"/>
+-    <ivyauthor name="Apache ZooKeeper" url="http://zookeeper.apache.org"/>
+-    <description>ZooKeeper REST</description>
+-  </info>
+-
+-  <configurations defaultconfmapping="default">
+-    <conf name="default"/>
+-    <conf name="test"/>
+-  </configurations>
+-
+-  <dependencies>
+-    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+-  
+-    <!-- transitive false turns off dependency checking, log4j deps seem borked -->
+-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+-    <dependency org="asm" name="asm" rev="3.1" />
+-    <dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
+-    <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
+-    <dependency org="com.sun.jersey" name="jersey-json" rev="1.1.5.1" />
+-
+-    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
+-    <dependency org="com.sun.jersey" name="jersey-client" rev="1.1.5.1" conf="test->default"/>
+-  </dependencies>
+-
+-</ivy-module>
+diff --git a/src/contrib/rest/oldbuild._xml b/src/contrib/rest/oldbuild._xml
+new file mode 100644
+index 0000000..649dff7
+--- /dev/null
++++ b/src/contrib/rest/oldbuild._xml
+@@ -0,0 +1,167 @@
++<?xml version="1.0"?>
++
++<!--
++   Licensed to the Apache Software Foundation (ASF) under one or more
++   contributor license agreements.  See the NOTICE file distributed with
++   this work for additional information regarding copyright ownership.
++   The ASF licenses this file to You under the Apache License, Version 2.0
++   (the "License"); you may not use this file except in compliance with
++   the License.  You may obtain a copy of the License at
++
++       http://www.apache.org/licenses/LICENSE-2.0
++
++   Unless required by applicable law or agreed to in writing, software
++   distributed under the License is distributed on an "AS IS" BASIS,
++   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++   See the License for the specific language governing permissions and
++   limitations under the License.
++-->
++
++<project name="rest" default="jar">
++  <import file="../build-contrib.xml"/>
++
++	<property name="test.build.dir" value="${build.test}" />
++    <property name="test.src.dir" value="src/test"/>
++    <property name="test.log.dir" value="${test.build.dir}/logs" />
++    <property name="test.data.dir" value="${test.build.dir}/data" />
++    <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
++    <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
++    <property name="test.output" value="no" />
++    <property name="test.timeout" value="900000" />
++    <property name="test.junit.output.format" value="plain" />
++    <property name="test.junit.fork.mode" value="perTest" />
++    <property name="test.junit.printsummary" value="yes" />
++    <property name="test.junit.haltonfailure" value="no" />
++    <property name="test.junit.maxmem" value="512m" />
++
++    <!-- ====================================================== -->
++    <!-- Macro definitions                                      -->
++    <!-- ====================================================== -->
++    <macrodef name="macro_tar" description="Worker Macro for tar">
++      <attribute name="param.destfile"/>
++      <element name="param.listofitems"/>
++      <sequential>
++        <tar compression="gzip" longfile="gnu"
++             destfile="@{param.destfile}">
++          <param.listofitems/>
++        </tar>
++      </sequential>
++    </macrodef>
++
++  <target name="setjarname">
++    <property name="jarname"
++              value="${build.dir}/zookeeper-${version}-${name}.jar"/>
++  </target>
++
++  <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
++
++  <target name="test"
++          depends="compile-test,test-init,test-category,test-start,junit.run,test-stop" />
++
++	<target name="compile-test" depends="ivy-retrieve-test,compile">
++  		<property name="target.jdk" value="${ant.java.version}" />	
++		<property name="src.test.local" location="${basedir}/src/test" />
++		<mkdir dir="${build.test}"/>
++		<javac srcdir="${src.test.local}" 
++			destdir="${build.test}" 
++			target="${target.jdk}" 
++			debug="on" >
++			<classpath refid="classpath" />
++		</javac>
++	</target>
++	
++    <target name="test-init" depends="jar,compile-test">
++        <delete dir="${test.log.dir}" />
++        <delete dir="${test.tmp.dir}" />
++        <delete dir="${test.data.dir}" />
++        <mkdir dir="${test.log.dir}" />
++        <mkdir dir="${test.tmp.dir}" />
++        <mkdir dir="${test.data.dir}" />
++    </target>
++
++    <target name="test-start">
++      <exec executable="${test.src.dir}/zkServer.sh">
++        <arg value="startClean"/>
++      </exec>
++    </target>
++
++    <target name="test-stop">
++      <exec executable="${test.src.dir}/zkServer.sh">
++        <arg value="stop"/>
++      </exec>
++    </target>
++
++	<target name="test-category">
++         <property name="test.category" value=""/>
++    </target>
++
++	<target name="junit.run">
++		<echo message="${test.src.dir}" />
++        <junit showoutput="${test.output}"
++               printsummary="${test.junit.printsummary}"
++               haltonfailure="${test.junit.haltonfailure}"
++               fork="yes"
++               forkmode="${test.junit.fork.mode}"
++               maxmemory="${test.junit.maxmem}"
++               dir="${basedir}" timeout="${test.timeout}"
++               errorProperty="tests.failed" failureProperty="tests.failed">
++          <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
++          <sysproperty key="test.data.dir" value="${test.data.dir}" />
++          <sysproperty key="log4j.configuration"
++                    value="file:${basedir}/conf/log4j.properties" />
++          <classpath refid="classpath"/>
++          <classpath>
++             <pathelement path="${build.test}" />
++          </classpath>
++          <formatter type="${test.junit.output.format}" />
++          <batchtest todir="${test.log.dir}" unless="testcase">
++              <fileset dir="${test.src.dir}"
++                     includes="**/*${test.category}Test.java"/>
++          </batchtest>
++          <batchtest todir="${test.log.dir}" if="testcase">
++              <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
++          </batchtest>
++       </junit>
++       <fail if="tests.failed">Tests failed!</fail>
++    </target>
++
++  <target name="jar" depends="checkMainCompiled, setjarname, compile">
++    <echo message="contrib: ${name}"/>
++    <jar jarfile="${jarname}">
++      <fileset file="${zk.root}/LICENSE.txt" />
++      <fileset dir="${build.classes}"/>
++      <fileset dir="${build.test}"/>
++    </jar>
++  </target>
++
++  <target name="run" depends="jar">
++    <echo message="contrib: ${name}"/>
++    <java classname="org.apache.zookeeper.server.jersey.RestMain" fork="true">
++      <classpath>
++        <pathelement path="${jarname}" />
++        <fileset dir="${build.dir}/lib" includes="*.jar"/>
++        <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
++        <pathelement path="${zk.root}/src/contrib/${name}/conf" />
++        <fileset dir="${zk.root}/src/java/lib">
++          <include name="**/*.jar" />
++        </fileset>
++      </classpath>
++    </java>
++  </target>
++
++  <target name="tar" depends="clean, jar">
++    <echo message="building tar.gz: ${name}" />
++    <macro_tar param.destfile="${build.dir}/zookeeper-${version}-${name}.tar.gz">
++      <param.listofitems>
++        <tarfileset dir="${build.dir}/lib" prefix="lib" includes="**/*.jar" />
++        <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
++        <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
++        <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
++        <tarfileset dir="${zk.root}/src/java/lib" prefix="lib" includes="**/*.jar" />
++        <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
++      </param.listofitems>
++    </macro_tar>
++  </target>
++
++</project>
++
+diff --git a/src/contrib/rest/oldivy._xml b/src/contrib/rest/oldivy._xml
+new file mode 100644
+index 0000000..903d390
+--- /dev/null
++++ b/src/contrib/rest/oldivy._xml
+@@ -0,0 +1,48 @@
++<!--
++   Licensed to the Apache Software Foundation (ASF) under one or more
++   contributor license agreements.  See the NOTICE file distributed with
++   this work for additional information regarding copyright ownership.
++   The ASF licenses this file to You under the Apache License, Version 2.0
++   (the "License"); you may not use this file except in compliance with
++   the License.  You may obtain a copy of the License at
++
++       http://www.apache.org/licenses/LICENSE-2.0
++
++   Unless required by applicable law or agreed to in writing, software
++   distributed under the License is distributed on an "AS IS" BASIS,
++   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++   See the License for the specific language governing permissions and
++   limitations under the License.
++-->
++
++<ivy-module version="2.0"
++            xmlns:e="http://ant.apache.org/ivy/extra">
++
++  <info organisation="org.apache.zookeeper"
++        module="${name}" revision="${version}">
++    <license name="Apache 2.0"/>
++    <ivyauthor name="Apache ZooKeeper" url="http://zookeeper.apache.org"/>
++    <description>ZooKeeper REST</description>
++  </info>
++
++  <configurations defaultconfmapping="default">
++    <conf name="default"/>
++    <conf name="test"/>
++  </configurations>
++
++  <dependencies>
++    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
++    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
++  
++    <!-- transitive false turns off dependency checking, log4j deps seem borked -->
++    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
++    <dependency org="asm" name="asm" rev="3.1" />
++    <dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
++    <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
++    <dependency org="com.sun.jersey" name="jersey-json" rev="1.1.5.1" />
++
++    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
++    <dependency org="com.sun.jersey" name="jersey-client" rev="1.1.5.1" conf="test->default"/>
++  </dependencies>
++
++</ivy-module>
+diff --git a/src/contrib/zooinspector/ivy.xml b/src/contrib/zooinspector/ivy.xml
+index 4e5107e..ac71a9b 100644
+--- a/src/contrib/zooinspector/ivy.xml
++++ b/src/contrib/zooinspector/ivy.xml
+@@ -42,7 +42,7 @@
+     <dependency org="commons-lang" name="commons-lang" 
+                 rev="2.4" conf="releaseaudit->default"/>
+     <dependency org="commons-collections" name="commons-collections" 
+-                rev="3.1" conf="releaseaudit->default"/>
++                rev="3.2.1" conf="releaseaudit->default"/>
+   </dependencies>
+ 
+-</ivy-module>
+\ No newline at end of file
++</ivy-module>
diff --git a/zookeeper.spec b/zookeeper.spec
index 17e49ff..59d0d7f 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -17,6 +17,8 @@ Source3:       zkEnv.sh
 Patch1:        %{name}-3.4.5-zktreeutil-gcc.patch
 Patch2:        %{name}-3.4.6-ivy-build.patch
 #Patch3:        {name}-3.4.5-add-PIE-and-RELRO.patch
+# The native bits don't compile on ARM
+ExcludeArch:   %{arm}
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,12 +43,16 @@ BuildRequires: checkstyle
 BuildRequires: jline1
 BuildRequires: jtoaster
 BuildRequires: junit
+BuildRequires: jdiff
 %if 0%{?fedora} >= 21
 BuildRequires: mvn(org.slf4j:slf4j-log4j12)
 BuildRequires: javapackages-tools
+Requires:      log4j12
 %else
 BuildRequires: mvn(log4j:log4j)
+Requires:      log4j
 %endif
+
 BuildRequires: json_simple
 
 BuildRequires: mockito
@@ -55,13 +61,16 @@ BuildRequires: slf4j
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis
 
+# remove later on.
+BuildRequires: apache-commons-parent
+BuildRequires: jetty-server
+BuildRequires: jetty-servlet
 BuildRequires: systemd
 
 Requires:      checkstyle
 Requires:      jline1
 Requires:      jtoaster
 Requires:      junit
-Requires:      log4j
 Requires:      mockito
 Requires:      netty3
 Requires:      slf4j
@@ -111,6 +120,7 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_
 
 %build
 %ant -Divy.mode=local \
+-DCLASSPATH=/usr/share/java/log4j12-1.2.17.jar \
 -Dtarget.jdk=1.5 \
 -Djavadoc.link.java=%{_javadocdir}/java \
 -Dant.build.javac.source=1.5 \