[mesos/f20] update to include examples

[tstclair]

commit 3e7c6dbb13a722154325efee93faec53dd1e1714
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Oct 23 14:43:21 2014 -0500

    update to include examples

 mesos.spec |   29 ++++++++++++++++++++++++-----
 sources    |    2 +-
 2 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/mesos.spec b/mesos.spec
index 0cee526..6e6bb42 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
@@ -17,7 +17,7 @@
 
 Name:          mesos
 Version:       0.21.0
-Release:       3.SNAPSHOT.%{shortcommit}%{?dist}
+Release:       4.SNAPSHOT.%{shortcommit}%{?dist}
 Summary:       Cluster manager for sharing distributed application frameworks
 License:       ASL 2.0
 URL:           http://mesos.apache.org/
@@ -63,12 +63,15 @@ BuildRequires: glog-devel
 BuildRequires: gmock-devel
 BuildRequires: gflags-devel
 BuildRequires: gtest-devel
+%ifnarch s390 s390x
 BuildRequires: gperftools-devel
+%endif
 BuildRequires: libev-source
 BuildRequires: leveldb-devel
 BuildRequires: protobuf-python
 BuildRequires: protobuf-java
-BuildRequires: zookeeper-lib-devel
+BuildRequires: zookeeper-devel
+#BuildRequires: zookeeper-lib-devel
 BuildRequires: protobuf-devel
 BuildRequires: picojson-devel
 BuildRequires: python-pip
@@ -88,6 +91,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.
@@ -142,6 +149,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
@@ -196,8 +205,8 @@ pushd src/python
 python setup.py install --root=%{buildroot} --prefix=/usr
 popd
 
-mkdir -p %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libexecdir}/%{name}/python/%{name} %{buildroot}%{python_sitelib}
+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
@@ -245,6 +254,13 @@ install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/
 %mvn_artifact src/java/%{name}.pom src/java/target/%{name}-%{version}.jar
 %mvn_install
 
+######################
+# install the examples
+######################
+make clean
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -rf src/examples %{buildroot}%{_datadir}/%{name}
+
 ############################################
 %files
 %doc LICENSE NOTICE
@@ -307,6 +323,9 @@ exit 0
 /sbin/ldconfig
 
 %changelog
+* Thu Oct 23 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-4.SNAPSHOT.e960cdf
+- Update to include examples
+
 * Thu Oct 9 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-3.SNAPSHOT.c96ba8f6
 - Update and shifting configs to latest.
 
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