[pacemaker] Repair the use of bcond variables
Andrew Beekhof
beekhof at fedoraproject.org
Tue Jan 11 08:19:32 UTC 2011
commit e766f91160cc240eaa9992ae6e42668985043d5e
Author: Andrew Beekhof <andrew at beekhof.net>
Date: Tue Jan 11 09:14:32 2011 +0100
Repair the use of bcond variables
pacemaker.spec | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 5dda9bf..bb210e5 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -20,7 +20,7 @@
# We generate some docs using Publican, but its not available everywhere
%bcond_with publican
-%global specversion 4
+%global specversion 5
%global upstream_version Pacemaker-1.1.4
%global upstream_prefix Pacemaker-1-1-
@@ -172,15 +172,16 @@ resource health.
%build
./autogen.sh
+
%{configure} \
- %{!?_with_heartbeat: --without-heartbeat} \
- %{!?_with_ais: --without-ais} \
- %{!?_with_esmtp: --without-esmtp} \
- %{!?_with_snmp: --without-snmp} \
- %{?_with_cman: --with-cman} \
- %{?_with_profiling: --with-profiling} \
- %{?_with_gcov: --with-gcov} \
- %{?_with_tracedata --with-tracedata} \
+ %{!?with_heartbeat: --without-heartbeat} \
+ %{!?with_ais: --without-ais} \
+ %{!?with_esmtp: --without-esmtp} \
+ %{!?with_snmp: --without-snmp} \
+ %{?with_cman: --with-cman} \
+ %{?with_profiling: --with-profiling} \
+ %{?with_gcov: --with-gcov} \
+ %{?with_tracedata --with-tracedata} \
--docdir=%{pcmk_docdir} \
--localstatedir=%{_var} \
--with-initdir=%{_initddir} \
@@ -317,6 +318,10 @@ rm -rf %{buildroot}
%doc AUTHORS
%changelog
+* Tue Jan 11 2011 Andrew Beekhof <andrew at beekhof.net> 1.1.4-5
+- Re-enable corosync and heartbeat support with correct bcond variable
+ usage
+
* Wed Dec 8 2010 Fabio M. Di Nitto <fdinitto at redhat.com> 1.1.4-4
- Temporary drop publican doc build
More information about the scm-commits
mailing list