1.1.13-2.rev3: aesthetics (vertical spacing, ordering)

(Partly adopted from another spec)
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný 2015-10-13 21:04:29 +02:00
parent 9227083036
commit d477b83879
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2

View File

@ -2,19 +2,18 @@
%global uname hacluster
%global pcmk_docdir %{_docdir}/%{name}
%global specversion 2.rev2
%global specversion 2.rev3
%global commit 6052cd16c2f455809f8088af76ce86483bf98353
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global github_owner ClusterLabs
%global py_site %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
# Turn off the auto compilation of python files not in the site-packages directory
# 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_version %(pkg-config corosync --modversion | awk -F . '{print $1}')
%global rawhide %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?)
%global cs_version %(pkg-config corosync --modversion | awk -F . '{print $1}')
%global py_site %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
# Conditionals
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
@ -188,8 +187,8 @@ License: GPLv2+ and LGPLv2+
Summary: Pacemaker remote daemon for non-cluster nodes
Group: System Environment/Daemons
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release}
Requires: resource-agents
Requires: %{name}-cli = %{version}-%{release}
Requires: resource-agents
%if %{defined systemd_requires}
%systemd_requires
%endif
@ -220,7 +219,6 @@ manager for Corosync, CMAN and/or Linux-HA.
The %{name}-libs-devel package contains headers and shared libraries
for developing tools for Pacemaker.
%package cts
License: GPLv2+ and LGPLv2+
Summary: Test framework for cluster-related technologies like Pacemaker
@ -242,13 +240,12 @@ Documentation for Pacemaker.
Pacemaker is an advanced, scalable High-Availability cluster resource
manager for Corosync, CMAN and/or Linux-HA.
%prep
%autosetup -n %{name}-%{commit} -p1
# Force the local time
#
# 'git' sets the file date to the date of the last commit.
# Git sets the file date to the date of the last commit.
# This can result in files having been created in the future
# when building on machines in timezones 'behind' the one the
# commit occurred in - which seriously confuses 'make'
@ -322,7 +319,7 @@ rm -rf %{buildroot}
%systemd_preun pacemaker.service
%postun
%systemd_postun_with_restart pacemaker.service
%systemd_postun_with_restart pacemaker.service
%post cli
%systemd_post crm_mon.service
@ -337,7 +334,7 @@ rm -rf %{buildroot}
%systemd_preun pacemaker_remote.service
%postun remote
%systemd_postun_with_restart pacemaker_remote.service
%systemd_postun_with_restart pacemaker_remote.service
%pre -n %{name}-libs
@ -370,6 +367,7 @@ exit 0
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude %{_libexecdir}/pacemaker/lrmd_test
%exclude %{_sbindir}/pacemaker_remoted
%{_libexecdir}/pacemaker/*
@ -402,8 +400,8 @@ exit 0
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
/usr/lib/ocf/resource.d/pacemaker
/usr/lib/ocf/resource.d/.isolation
/usr/lib/ocf/resource.d/pacemaker
# No need to special-case for corosync 1.99 any longer (not officially shipped)
%if 0%{?cs_version} < 2
@ -417,11 +415,6 @@ exit 0
%files cli
%defattr(-,root,root)
%if %{defined _unitdir}
%{_unitdir}/crm_mon.service
%endif
%{_sbindir}/cibadmin
%{_sbindir}/crm_diff
%{_sbindir}/crm_error
@ -436,6 +429,7 @@ exit 0
%{_sbindir}/crm_simulate
%{_sbindir}/crm_report
%{_sbindir}/crm_ticket
%doc %{_mandir}/man8/*
%exclude %{_mandir}/man8/attrd_updater.*
%exclude %{_mandir}/man8/crm_attribute.*
@ -446,6 +440,10 @@ exit 0
%exclude %{_mandir}/man8/pacemaker_remoted.*
%exclude %{_mandir}/man8/stonith_admin.*
%if %{defined _unitdir}
%{_unitdir}/crm_mon.service
%endif
%doc COPYING
%doc AUTHORS
%doc ChangeLog