From 8c3680d1260e4afc057a84b4be40f6d26df7c06d Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 1 Dec 2010 11:18:19 -0700 Subject: [PATCH] Revert "Always autogen the tree when building an RPM" This reverts commit d145838a21fb636461a2bceeada34db439f4a9ec. --- corosync.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/corosync.spec.in b/corosync.spec.in index 8be9e342..1040579a 100644 --- a/corosync.spec.in +++ b/corosync.spec.in @@ -27,7 +27,12 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89 # Build bits +%define buildtrunk 0 +%{?_with_buildtrunk: %define buildtrunk 1} + +%if %{buildtrunk} BuildRequires: autoconf automake +%endif BuildRequires: nss-devel BuildRequires: libibverbs-devel librdmacm-devel @@ -37,7 +42,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %setup -q -n %{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} %build +%if %{buildtrunk} ./autogen.sh +%endif export ibverbs_CFLAGS=-I/usr/include/infiniband \ export ibverbs_LIBS=-libverbs \