1.1.15-1 - Update for new upstream tarball: Pacemaker-1.1.15,
... for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.15 - Adapt spec file more akin to upstream version: . move xml schema files + PCMK-MIB.txt (81ef956), logrotate configuration file (ce576cf; drop it from -remote package as well), attrd_updater (aff80ae), the normal resource agents (1fc7287), and common directories under /var/lib/pacemaker (3492794) from main package under -cli . simplify docdir build parameter passing and drop as of now redundant chmod invocations (e91769e)
This commit is contained in:
Jan Pokorný
parent
e3564c987f
commit
e4bc0b66d0
@ -6,7 +6,7 @@
|
||||
%global pcmkversion 1.1.15
|
||||
# set following to the actual commit or, for final release, concatenate
|
||||
# "pcmkversion" macro to "Pacemaker-" (will yield a tag per the convention)
|
||||
%global commit Pacemaker-1.1.15-rc3
|
||||
%global commit Pacemaker-1.1.15
|
||||
%global lparen (
|
||||
%global rparen )
|
||||
%global shortcommit %(c=%{commit}; case ${c} in
|
||||
@ -98,7 +98,6 @@ Provides: pcmk-cluster-manager
|
||||
%systemd_requires
|
||||
%endif
|
||||
|
||||
|
||||
# Required for core functionality (python-devel depends on python)
|
||||
BuildRequires: automake autoconf libtool pkgconfig libtool-ltdl-devel
|
||||
BuildRequires: pkgconfig(glib-2.0) libxml2-devel libxslt-devel libuuid-devel
|
||||
@ -279,10 +278,13 @@ monitor resources.
|
||||
find . -exec touch \{\} \;
|
||||
|
||||
%build
|
||||
|
||||
# Early versions of autotools (e.g. RHEL <= 5) do not support --docdir
|
||||
export docdir=%{pcmk_docdir}
|
||||
|
||||
./autogen.sh
|
||||
|
||||
# RHEL <= 5 does not support --docdir
|
||||
docdir=%{pcmk_docdir} %{configure} \
|
||||
%{configure} \
|
||||
%{?with_profiling: --with-profiling} \
|
||||
%{?with_coverage: --with-coverage} \
|
||||
%{!?with_doc: --with-brand=} \
|
||||
@ -293,14 +295,14 @@ docdir=%{pcmk_docdir} %{configure} \
|
||||
--with-nagios-metadata-dir=%{_datadir}/pacemaker/nagios/plugins-metadata/ \
|
||||
--with-nagios-plugin-dir=%{_libdir}/nagios/plugins/
|
||||
|
||||
make %{_smp_mflags} V=1 docdir=%{pcmk_docdir} all
|
||||
make %{_smp_mflags} V=1 all
|
||||
|
||||
%check
|
||||
# Prevent false positives in rpmlint
|
||||
./BasicSanity.sh -V pengine cli 2>&1 | sed s/[fF]ail/faiil/g
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install
|
||||
make DESTDIR=%{buildroot} V=1 install
|
||||
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
||||
install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
|
||||
@ -323,9 +325,6 @@ chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
|
||||
|
||||
# These are not actually scripts
|
||||
find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x
|
||||
find %{buildroot} -name '*.xsl' -type f -print0 | xargs -0 chmod a-x
|
||||
find %{buildroot} -name '*.rng' -type f -print0 | xargs -0 chmod a-x
|
||||
find %{buildroot} -name '*.dtd' -type f -print0 | xargs -0 chmod a-x
|
||||
|
||||
# Don't package static libs
|
||||
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
|
||||
@ -427,9 +426,6 @@ exit 0
|
||||
###########################################################
|
||||
%defattr(-,root,root)
|
||||
|
||||
%exclude %{_datadir}/pacemaker/tests
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
|
||||
%{_sbindir}/pacemakerd
|
||||
|
||||
@ -439,11 +435,7 @@ exit 0
|
||||
%{_initrddir}/pacemaker
|
||||
%endif
|
||||
|
||||
%exclude %{_datadir}/pacemaker/report.common
|
||||
%exclude %{_datadir}/pacemaker/report.collector
|
||||
%exclude %{_datadir}/pacemaker/nagios/plugins-metadata/*
|
||||
%{_datadir}/pacemaker
|
||||
%{_datadir}/snmp/mibs/PCMK-MIB.txt
|
||||
|
||||
%exclude %{_libexecdir}/pacemaker/lrmd_test
|
||||
%exclude %{_sbindir}/pacemaker_remoted
|
||||
@ -452,30 +444,30 @@ exit 0
|
||||
%{_sbindir}/crm_attribute
|
||||
%{_sbindir}/crm_master
|
||||
%{_sbindir}/crm_node
|
||||
%{_sbindir}/attrd_updater
|
||||
%{_sbindir}/stonith_admin
|
||||
|
||||
%doc %{_mandir}/man7/*
|
||||
%doc %{_mandir}/man8/attrd_updater.*
|
||||
%doc %{_mandir}/man7/crmd.*
|
||||
%doc %{_mandir}/man7/pengine.*
|
||||
%doc %{_mandir}/man7/stonithd.*
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_controld.*
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
%doc %{_mandir}/man8/crm_attribute.*
|
||||
%doc %{_mandir}/man8/crm_node.*
|
||||
%doc %{_mandir}/man8/crm_master.*
|
||||
%doc %{_mandir}/man8/pacemakerd.*
|
||||
%doc %{_mandir}/man8/stonith_admin.*
|
||||
|
||||
%doc %{_datadir}/pacemaker/alerts
|
||||
|
||||
%license COPYING
|
||||
%doc AUTHORS
|
||||
%doc ChangeLog
|
||||
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cib
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
|
||||
%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/controld
|
||||
/usr/lib/ocf/resource.d/pacemaker/remote
|
||||
/usr/lib/ocf/resource.d/.isolation
|
||||
/usr/lib/ocf/resource.d/pacemaker
|
||||
|
||||
%if %{with upstart_job}
|
||||
%config(noreplace) %{_sysconfdir}/init/pacemaker.conf
|
||||
@ -485,6 +477,7 @@ exit 0
|
||||
%files cli
|
||||
%defattr(-,root,root)
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/crm_mon
|
||||
|
||||
%if %{defined _unitdir}
|
||||
@ -495,6 +488,7 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/init/crm_mon.conf
|
||||
%endif
|
||||
|
||||
%{_sbindir}/attrd_updater
|
||||
%{_sbindir}/cibadmin
|
||||
%{_sbindir}/crm_diff
|
||||
%{_sbindir}/crm_error
|
||||
@ -509,15 +503,32 @@ exit 0
|
||||
%{_sbindir}/crm_simulate
|
||||
%{_sbindir}/crm_report
|
||||
%{_sbindir}/crm_ticket
|
||||
%{_datadir}/pacemaker/report.common
|
||||
%{_datadir}/pacemaker/report.collector
|
||||
%exclude %{_datadir}/pacemaker/alerts
|
||||
%exclude %{_datadir}/pacemaker/tests
|
||||
%{_datadir}/pacemaker
|
||||
%{_datadir}/snmp/mibs/PCMK-MIB.txt
|
||||
|
||||
%exclude /usr/lib/ocf/resource.d/pacemaker/controld
|
||||
%exclude /usr/lib/ocf/resource.d/pacemaker/o2cb
|
||||
%exclude /usr/lib/ocf/resource.d/pacemaker/remote
|
||||
|
||||
%dir /usr/lib/ocf
|
||||
%dir /usr/lib/ocf/resource.d
|
||||
/usr/lib/ocf/resource.d/pacemaker
|
||||
|
||||
%doc %{_mandir}/man7/*
|
||||
%exclude %{_mandir}/man7/crmd.*
|
||||
%exclude %{_mandir}/man7/pengine.*
|
||||
%exclude %{_mandir}/man7/stonithd.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
|
||||
%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
%doc %{_mandir}/man8/*
|
||||
%exclude %{_mandir}/man8/attrd_updater.*
|
||||
%exclude %{_mandir}/man8/crm_attribute.*
|
||||
%exclude %{_mandir}/man8/crm_node.*
|
||||
%exclude %{_mandir}/man8/crm_master.*
|
||||
%exclude %{_mandir}/man8/fence_pcmk.*
|
||||
%exclude %{_mandir}/man8/fence_legacy.*
|
||||
%exclude %{_mandir}/man8/pacemakerd.*
|
||||
%exclude %{_mandir}/man8/pacemaker_remoted.*
|
||||
%exclude %{_mandir}/man8/stonith_admin.*
|
||||
@ -526,6 +537,10 @@ exit 0
|
||||
%doc AUTHORS
|
||||
%doc ChangeLog
|
||||
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
|
||||
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
|
||||
|
||||
%files -n %{name}-libs
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -550,7 +565,6 @@ exit 0
|
||||
%files remote
|
||||
%defattr(-,root,root)
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
|
||||
%if %{defined _unitdir}
|
||||
%{_unitdir}/pacemaker_remote.service
|
||||
@ -594,6 +608,18 @@ exit 0
|
||||
%attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 22 2016 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.15-1
|
||||
- Update for new upstream tarball: Pacemaker-1.1.15,
|
||||
for full details, see included ChangeLog file or
|
||||
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-1.1.15
|
||||
- Adapt spec file more akin to upstream version:
|
||||
. move xml schema files + PCMK-MIB.txt (81ef956), logrotate configuration
|
||||
file (ce576cf; drop it from -remote package as well), attrd_updater
|
||||
(aff80ae), the normal resource agents (1fc7287), and common directories
|
||||
under /var/lib/pacemaker (3492794) from main package under -cli
|
||||
. simplify docdir build parameter passing and drop as of now
|
||||
redundant chmod invocations (e91769e)
|
||||
|
||||
* Fri May 27 2016 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 1.1.15-0.1.rc3
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-1.1.15-rc3,
|
||||
for full details, see included ChangeLog file or
|
||||
|
||||
Loading…
Reference in New Issue
Block a user