diff --git a/pacemaker.spec b/pacemaker.spec index dfedb87..3d39f23 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -2,7 +2,7 @@ %global uname hacluster %global pcmk_docdir %{_docdir}/%{name} -%global specversion 2 +%global specversion 2.rev1 %global commit 6052cd16c2f455809f8088af76ce86483bf98353 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global github_owner ClusterLabs @@ -13,9 +13,8 @@ # Needed so that the -devel package is multilib compliant %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%global cs_major %(pkg-config corosync --modversion | awk -F . '{print $1}') -%global cs_minor %(pkg-config corosync --modversion | awk -F . '{print $2}') -%global rawhide %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?) +%global cs_version %(pkg-config corosync --modversion | awk -F . '{print $1}') +%global rawhide %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?) # Conditionals # Invoke "rpmbuild --without " or "rpmbuild --with " @@ -406,12 +405,10 @@ exit 0 /usr/lib/ocf/resource.d/pacemaker /usr/lib/ocf/resource.d/.isolation - -%if 0%{?cs_major} < 2 -%if 0%{?cs_minor} < 8 +# No need to special-case for corosync 1.99 any longer (not officially shipped) +%if 0%{?cs_version} < 2 %{_libexecdir}/lcrso/pacemaker.lcrso %endif -%endif %if %{with upstart_job} %config(noreplace) %{_sysconfdir}/init/pacemaker.conf