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

1.1.13-2.rev1: do not detect corosync minor version

Browse Source 
No need to special-case for corosync 1.99 any longer (not officially
shipped).

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný 2015-10-13 19:10:12 +02:00
parent b7d8531405
commit 33aaad5821
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pacemaker.spec
View File

@ -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 <feature>" or "rpmbuild --with <feature>"
@ -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