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

[tstclair]

commit 4816c8129650be4199911167ff06ec651f429b64
Merge: 91cf4ab 573b711
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Aug 28 13:09:26 2014 -0500

    Merge branch 'f20' into f21

 mesos.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc mesos.spec
index 6b428fc,c672bba..12b140b
--- a/mesos.spec
+++ b/mesos.spec
@@@ -142,9 -140,8 +144,10 @@@ autoreconf -vf
  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}
 +
  %else
+ autoreconf -vfi
  %configure
  %endif