[mesos/f21] update build still pending on zookeeper in f21

[tstclair]

commit f3f2a2a10ac52e937af5627f81a567204001d94d
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Oct 22 14:38:40 2014 -0500

    update build still pending on zookeeper in f21

 .gitignore |    1 +
 mesos.spec |   20 ++++++++++++++++----
 sources    |    2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index edb715b..f29a141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mesos-0.18.0-a411a4b.tar.gz
 /mesos-0.18.2-453b973.tar.gz
 /mesos-0.20.0-f421ffd.tar.gz
+/mesos-0.21.0-e960cdf.tar.gz
diff --git a/mesos.spec b/mesos.spec
index 6eb6999..d0e2236 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -1,4 +1,4 @@
-%global commit      c96ba8f6035329acebb25ca0f52215284bbf8f8f
+%global commit      e960cdffec20d54b4f57f552d13cd92004f8e437
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global tag         0.21.0
 %global skiptests   1
@@ -32,6 +32,9 @@ Source5:       %{name}-slave
 ####################################
 Patch0:        mesos-0.21-integ.patch
 
+# Transitive from zookeeper.
+ExcludeArch:   %{arm}
+
 BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf
@@ -70,7 +73,7 @@ BuildRequires: libev-source
 BuildRequires: leveldb-devel
 BuildRequires: protobuf-python
 BuildRequires: protobuf-java
-BuildRequires: zookeeper-lib-devel
+BuildRequires: zookeeper-devel >= 3.4.6
 BuildRequires: protobuf-devel
 BuildRequires: picojson-devel
 BuildRequires: python-pip
@@ -90,6 +93,10 @@ Requires: docker
 %endif
 %endif
 
+# The slaves will indirectly require time syncing with the master
+# nodes so just call out the dependency.
+Requires: ntp
+
 %description
 Apache Mesos is a cluster manager that provides efficient resource
 isolation and sharing across distributed applications, or frameworks.
@@ -144,6 +151,8 @@ autoreconf -i
 %endif
 
 %build
+
+echo "CXXFLAGS=$CXXFLAGS"
 ######################################
 # We need to rebuild libev and bind statically
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1049554 for details
@@ -198,8 +207,8 @@ pushd src/python
 python setup.py install --root=%{buildroot} --prefix=/usr
 popd
 
-mkdir -p %{buildroot}%{python_sitelib}%{name}
-mv -f %{buildroot}%{_libexecdir}/%{name}/python/%{name}/* %{buildroot}%{python_sitelib}/%{name}
+mkdir -p  %{buildroot}%{python_sitelib}
+cp -rf %{buildroot}%{_libexecdir}/%{name}/python/%{name}/* %{buildroot}%{python_sitelib}
 rm -rf %{buildroot}%{_libexecdir}/%{name}/python
 
 pushd src/python/native
@@ -241,6 +250,9 @@ mkdir -p -m0755 %{buildroot}/%{_var}/lib/%{name}
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/
 
+mkdir -p %{buildroot}%{_datadir}%{name}
+
+
 ######################
 # install java bindings
 ######################
diff --git a/sources b/sources
index 5f184a9..1c2e88b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb48e15e96befc627f3b17244eebe517  mesos-0.21.0-c96ba8f.tar.gz
+7828d770a1c24187f70b431933ecf698  mesos-0.21.0-e960cdf.tar.gz