rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Repair the use of bcond variables

Browse Source
This commit is contained in:
Andrew Beekhof 2011-01-11 09:14:32 +01:00
parent c820837ff5
commit e766f91160
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pacemaker.spec
View File

@ -20,7 +20,7 @@
# We generate some docs using Publican, but its not available everywhere # We generate some docs using Publican, but its not available everywhere
%bcond_with publican %bcond_with publican
%global specversion 4 %global specversion 5
%global upstream_version Pacemaker-1.1.4 %global upstream_version Pacemaker-1.1.4
%global upstream_prefix Pacemaker-1-1- %global upstream_prefix Pacemaker-1-1-
@ -172,15 +172,16 @@ resource health.
%build %build
./autogen.sh ./autogen.sh
%{configure} \ %{configure} \
%{!?_with_heartbeat: --without-heartbeat} \ %{!?with_heartbeat: --without-heartbeat} \
%{!?_with_ais: --without-ais} \ %{!?with_ais: --without-ais} \
%{!?_with_esmtp: --without-esmtp} \ %{!?with_esmtp: --without-esmtp} \
%{!?_with_snmp: --without-snmp} \ %{!?with_snmp: --without-snmp} \
%{?_with_cman: --with-cman} \ %{?with_cman: --with-cman} \
%{?_with_profiling: --with-profiling} \ %{?with_profiling: --with-profiling} \
%{?_with_gcov: --with-gcov} \ %{?with_gcov: --with-gcov} \
%{?_with_tracedata --with-tracedata} \ %{?with_tracedata --with-tracedata} \
--docdir=%{pcmk_docdir} \ --docdir=%{pcmk_docdir} \
--localstatedir=%{_var} \ --localstatedir=%{_var} \
--with-initdir=%{_initddir} \ --with-initdir=%{_initddir} \
@ -317,6 +318,10 @@ rm -rf %{buildroot}
%doc AUTHORS %doc AUTHORS
%changelog %changelog
* Tue Jan 11 2011 Andrew Beekhof <andrew@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@redhat.com> 1.1.4-4 * Wed Dec 8 2010 Fabio M. Di Nitto <fdinitto@redhat.com> 1.1.4-4
- Temporary drop publican doc build - Temporary drop publican doc build