pool/pacemaker
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 546501 from home:yan_gao:branches:network:ha-clustering:Factory:Test

Browse Source 
- Replace references to /var/adm/fillup-templates with new 
  %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/546501
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=280
This commit is contained in:
Yan Gao 2017-11-29 17:29:11 +00:00 committed by Git OBS Bridge
parent 5498ebebbb
commit 9714edda00
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pacemaker.changes
View File

@ -20,6 +20,12 @@ Wed Nov 29 12:05:00 UTC 2017 - ygao@suse.com
- tools: enable new crm_resource --cleanup/--refresh behavior - tools: enable new crm_resource --cleanup/--refresh behavior
- Upstream version cs: 53a3fe14b15b087bbde9ccb524d11d0a413cc6e9 - Upstream version cs: 53a3fe14b15b087bbde9ccb524d11d0a413cc6e9
-------------------------------------------------------------------
Thu Nov 23 13:48:52 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.co Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.co

15
pacemaker.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
# Globals and defines to control package behavior (configure these as desired) # Globals and defines to control package behavior (configure these as desired)
## User and group to use for nonprivileged services ## User and group to use for nonprivileged services
@ -356,9 +361,9 @@ make %{?_smp_mflags} all
%install %install
%make_install %make_install
install -d -m755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m755 %{buildroot}%{_fillupdir}
install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker
install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.crm_mon install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon
# Scripts that should be executable # Scripts that should be executable
chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
@ -560,8 +565,8 @@ fi
%dir %{_libexecdir}/ocf/resource.d %dir %{_libexecdir}/ocf/resource.d
%{_libexecdir}/ocf/resource.d/pacemaker %{_libexecdir}/ocf/resource.d/pacemaker
%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker %config(noreplace) %{_fillupdir}/sysconfig.pacemaker
%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.crm_mon %config(noreplace) %{_fillupdir}/sysconfig.crm_mon
%{_mandir}/man7/* %{_mandir}/man7/*
%exclude %{_mandir}/man7/crmd.* %exclude %{_mandir}/man7/crmd.*
%exclude %{_mandir}/man7/pengine.* %exclude %{_mandir}/man7/pengine.*