[mesos/f21: 2/2] Merge branch 'f20' into f21

[tstclair]

commit 91cf4aba06d436e564489090ee5fbe248cef1af2
Merge: 589c373 093f3f4
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Aug 28 08:40:05 2014 -0500

    Merge branch 'f20' into f21
    
    Conflicts:
    	mesos.spec

 mesos-0.20-integ.patch |   13 +++++++++++++
 mesos-master-env.sh    |    1 +
 mesos-slave-env.sh     |    8 +++++---
 mesos.spec             |   40 +++++++++++++++++++++++++++++-----------
 4 files changed, 48 insertions(+), 14 deletions(-)
---
diff --cc mesos.spec
index 6779fec,334109d..6b428fc
--- a/mesos.spec
+++ b/mesos.spec
@@@ -56,16 -60,14 +60,18 @@@ BuildRequires: maven-dependency-plugi
  BuildRequires: exec-maven-plugin
  BuildRequires: maven-remote-resources-plugin
  BuildRequires: maven-site-plugin
- BuildRequires: protobuf-python
- BuildRequires: python-boto
 +BuildRequires: picojson-devel
  
  Requires: protobuf-python
+ %endif
+ 
+ # Explicit call out of installation requirements not found via
+ # package dependency tracking.
  Requires: python-boto
 +
 +%ifarch x86_64
  Requires: docker-io
 +%endif
  
  %description
  Apache Mesos is a cluster manager that provides efficient resource
@@@ -133,9 -137,13 +141,13 @@@ export M2_HOME=/usr/share/xmv
  autoreconf -vfi
  export LDFLAGS="$RPM_LD_FLAGS -L$PWD/libev-%{libevver}/.libs"
  ZOOKEEPER_JAR="/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/log4j.jar" %configure --disable-bundled --disable-static
- make
- #%{?_smp_mflags}
+ 
++make %{?_smp_mflags}
++
+ %else
+ %configure
+ %endif
  
 -make %{?_smp_mflags}
 -
  %check
  ######################################
  # NOTE: as of 0.16.0 &> there has been a change in the startup routines which