[mesos/f20] Update to support unbundled
tstclair
tstclair at fedoraproject.org
Thu Aug 28 18:09:49 UTC 2014
commit 573b7119b45e9bdbf4043025f9bf4295c2eff6ae
Author: Timothy St. Clair <tstclair at redhat.com>
Date: Thu Aug 28 13:09:14 2014 -0500
Update to support unbundled
mesos.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mesos.spec b/mesos.spec
index 334109d..c672bba 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -107,11 +107,12 @@ The python-%{name} package contains Python bindings for %{name}.
%prep
%setup -q -n %{name}-%{commit}
+%patch0 -p1
+
+%if %unbundled
# remove all bundled elements prior to build
rm -f `find . | grep [.]tar`
-%patch0 -p1
-
######################################
# We need to rebuild libev and bind statically
# See https://bugzilla.redhat.com/show_bug.cgi?id=1049554 for details
@@ -119,6 +120,7 @@ rm -f `find . | grep [.]tar`
cp -r %{_datadir}/libev-source libev-%{libevver}
cd libev-%{libevver}
autoreconf -i
+%endif
%build
######################################
@@ -139,6 +141,7 @@ 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
%else
+autoreconf -vfi
%configure
%endif
More information about the scm-commits
mailing list