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

1.1.13-2.rev7: draw the line behind legacy stonith

Browse Source 
(Partly adopted from another spec)
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný 2015-10-13 21:41:06 +02:00
parent 21932ded90
commit 1426a243dd
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pacemaker.spec
View File

@ -2,7 +2,7 @@
%global uname hacluster %global uname hacluster
%global pcmk_docdir %{_docdir}/%{name} %global pcmk_docdir %{_docdir}/%{name}
%global specversion 2.rev6 %global specversion 2.rev7
%global commit 6052cd16c2f455809f8088af76ce86483bf98353 %global commit 6052cd16c2f455809f8088af76ce86483bf98353
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
%global github_owner ClusterLabs %global github_owner ClusterLabs
@ -19,9 +19,6 @@
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>" # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
# to disable or enable specific features # to disable or enable specific features
# Legacy stonithd fencing agents
%bcond_with stonithd
# Build with/without support for profiling tools # Build with/without support for profiling tools
%bcond_with profiling %bcond_with profiling
@ -93,10 +90,6 @@ BuildRequires: systemd-devel
Requires: corosync Requires: corosync
BuildRequires: corosynclib-devel BuildRequires: corosynclib-devel
%if %{with stonithd}
BuildRequires: cluster-glue-libs-devel
%endif
%if !%{rawhide} %if !%{rawhide}
# More often than not, inkscape is busted on rawhide, don't even bother # More often than not, inkscape is busted on rawhide, don't even bother
@ -120,7 +113,7 @@ when related resources fail and can be configured to periodically check
resource health. resource health.
Available rpmbuild rebuild options: Available rpmbuild rebuild options:
--with(out) : stonithd doc coverage profiling pre_release upstart_job --with(out) : doc coverage profiling pre_release upstart_job
%package cli %package cli
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
@ -273,6 +266,8 @@ find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
# Do not package these either # Do not package these either
rm -f %{buildroot}/%{_libdir}/service_crm.so rm -f %{buildroot}/%{_libdir}/service_crm.so
rm -f %{buildroot}/%{_sbindir}/fence_legacy
rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.*
# Don't ship init scripts for systemd based platforms # Don't ship init scripts for systemd based platforms
%if %{defined _unitdir} %if %{defined _unitdir}
@ -359,7 +354,6 @@ exit 0
%{_sbindir}/crm_master %{_sbindir}/crm_master
%{_sbindir}/crm_node %{_sbindir}/crm_node
%{_sbindir}/attrd_updater %{_sbindir}/attrd_updater
%{_sbindir}/fence_legacy
%{_sbindir}/fence_pcmk %{_sbindir}/fence_pcmk
%{_sbindir}/stonith_admin %{_sbindir}/stonith_admin