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

1.1.15-1 - Update for new upstream tarball: Pacemaker-1.1.15,

Browse Source 
... 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ý 2016-06-22 22:23:16 +02:00
parent e3564c987f
commit e4bc0b66d0
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
pacemaker.spec
View File

@ -6,7 +6,7 @@
%global pcmkversion 1.1.15 %global pcmkversion 1.1.15
# set following to the actual commit or, for final release, concatenate # set following to the actual commit or, for final release, concatenate
# "pcmkversion" macro to "Pacemaker-" (will yield a tag per the convention) # "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 lparen (
%global rparen ) %global rparen )
%global shortcommit %(c=%{commit}; case ${c} in %global shortcommit %(c=%{commit}; case ${c} in
@ -98,7 +98,6 @@ Provides: pcmk-cluster-manager
%systemd_requires %systemd_requires
%endif %endif
# Required for core functionality (python-devel depends on python) # Required for core functionality (python-devel depends on python)
BuildRequires: automake autoconf libtool pkgconfig libtool-ltdl-devel BuildRequires: automake autoconf libtool pkgconfig libtool-ltdl-devel
BuildRequires: pkgconfig(glib-2.0) libxml2-devel libxslt-devel libuuid-devel BuildRequires: pkgconfig(glib-2.0) libxml2-devel libxslt-devel libuuid-devel
@ -279,10 +278,13 @@ monitor resources.
find . -exec touch \{\} \; find . -exec touch \{\} \;
%build %build
# Early versions of autotools (e.g. RHEL <= 5) do not support --docdir
export docdir=%{pcmk_docdir}
./autogen.sh ./autogen.sh
# RHEL <= 5 does not support --docdir %{configure} \
docdir=%{pcmk_docdir} %{configure} \
%{?with_profiling: --with-profiling} \ %{?with_profiling: --with-profiling} \
%{?with_coverage: --with-coverage} \ %{?with_coverage: --with-coverage} \
%{!?with_doc: --with-brand=} \ %{!?with_doc: --with-brand=} \
@ -293,14 +295,14 @@ docdir=%{pcmk_docdir} %{configure} \
--with-nagios-metadata-dir=%{_datadir}/pacemaker/nagios/plugins-metadata/ \ --with-nagios-metadata-dir=%{_datadir}/pacemaker/nagios/plugins-metadata/ \
--with-nagios-plugin-dir=%{_libdir}/nagios/plugins/ --with-nagios-plugin-dir=%{_libdir}/nagios/plugins/
make %{_smp_mflags} V=1 docdir=%{pcmk_docdir} all make %{_smp_mflags} V=1 all
%check %check
# Prevent false positives in rpmlint # Prevent false positives in rpmlint
./BasicSanity.sh -V pengine cli 2>&1 | sed s/[fF]ail/faiil/g ./BasicSanity.sh -V pengine cli 2>&1 | sed s/[fF]ail/faiil/g
%install %install
make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install make DESTDIR=%{buildroot} V=1 install
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker 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 # These are not actually scripts
find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x 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 # Don't package static libs
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
@ -427,9 +426,6 @@ exit 0
########################################################### ###########################################################
%defattr(-,root,root) %defattr(-,root,root)
%exclude %{_datadir}/pacemaker/tests
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker %config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
%{_sbindir}/pacemakerd %{_sbindir}/pacemakerd
@ -439,11 +435,7 @@ exit 0
%{_initrddir}/pacemaker %{_initrddir}/pacemaker
%endif %endif
%exclude %{_datadir}/pacemaker/report.common
%exclude %{_datadir}/pacemaker/report.collector
%exclude %{_datadir}/pacemaker/nagios/plugins-metadata/* %exclude %{_datadir}/pacemaker/nagios/plugins-metadata/*
%{_datadir}/pacemaker
%{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude %{_libexecdir}/pacemaker/lrmd_test %exclude %{_libexecdir}/pacemaker/lrmd_test
%exclude %{_sbindir}/pacemaker_remoted %exclude %{_sbindir}/pacemaker_remoted
@ -452,30 +444,30 @@ exit 0
%{_sbindir}/crm_attribute %{_sbindir}/crm_attribute
%{_sbindir}/crm_master %{_sbindir}/crm_master
%{_sbindir}/crm_node %{_sbindir}/crm_node
%{_sbindir}/attrd_updater
%{_sbindir}/stonith_admin %{_sbindir}/stonith_admin
%doc %{_mandir}/man7/* %doc %{_mandir}/man7/crmd.*
%doc %{_mandir}/man8/attrd_updater.* %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_attribute.*
%doc %{_mandir}/man8/crm_node.* %doc %{_mandir}/man8/crm_node.*
%doc %{_mandir}/man8/crm_master.* %doc %{_mandir}/man8/crm_master.*
%doc %{_mandir}/man8/pacemakerd.* %doc %{_mandir}/man8/pacemakerd.*
%doc %{_mandir}/man8/stonith_admin.* %doc %{_mandir}/man8/stonith_admin.*
%doc %{_datadir}/pacemaker/alerts
%license COPYING %license COPYING
%doc AUTHORS %doc AUTHORS
%doc ChangeLog %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/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/pengine
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox /usr/lib/ocf/resource.d/pacemaker/controld
%dir /usr/lib/ocf /usr/lib/ocf/resource.d/pacemaker/remote
%dir /usr/lib/ocf/resource.d
/usr/lib/ocf/resource.d/.isolation /usr/lib/ocf/resource.d/.isolation
/usr/lib/ocf/resource.d/pacemaker
%if %{with upstart_job} %if %{with upstart_job}
%config(noreplace) %{_sysconfdir}/init/pacemaker.conf %config(noreplace) %{_sysconfdir}/init/pacemaker.conf
@ -485,6 +477,7 @@ exit 0
%files cli %files cli
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%config(noreplace) %{_sysconfdir}/sysconfig/crm_mon %config(noreplace) %{_sysconfdir}/sysconfig/crm_mon
%if %{defined _unitdir} %if %{defined _unitdir}
@ -495,6 +488,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/init/crm_mon.conf %config(noreplace) %{_sysconfdir}/init/crm_mon.conf
%endif %endif
%{_sbindir}/attrd_updater
%{_sbindir}/cibadmin %{_sbindir}/cibadmin
%{_sbindir}/crm_diff %{_sbindir}/crm_diff
%{_sbindir}/crm_error %{_sbindir}/crm_error
@ -509,15 +503,32 @@ exit 0
%{_sbindir}/crm_simulate %{_sbindir}/crm_simulate
%{_sbindir}/crm_report %{_sbindir}/crm_report
%{_sbindir}/crm_ticket %{_sbindir}/crm_ticket
%{_datadir}/pacemaker/report.common %exclude %{_datadir}/pacemaker/alerts
%{_datadir}/pacemaker/report.collector %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/* %doc %{_mandir}/man8/*
%exclude %{_mandir}/man8/attrd_updater.*
%exclude %{_mandir}/man8/crm_attribute.* %exclude %{_mandir}/man8/crm_attribute.*
%exclude %{_mandir}/man8/crm_node.* %exclude %{_mandir}/man8/crm_node.*
%exclude %{_mandir}/man8/crm_master.* %exclude %{_mandir}/man8/crm_master.*
%exclude %{_mandir}/man8/fence_pcmk.* %exclude %{_mandir}/man8/fence_pcmk.*
%exclude %{_mandir}/man8/fence_legacy.*
%exclude %{_mandir}/man8/pacemakerd.* %exclude %{_mandir}/man8/pacemakerd.*
%exclude %{_mandir}/man8/pacemaker_remoted.* %exclude %{_mandir}/man8/pacemaker_remoted.*
%exclude %{_mandir}/man8/stonith_admin.* %exclude %{_mandir}/man8/stonith_admin.*
@ -526,6 +537,10 @@ exit 0
%doc AUTHORS %doc AUTHORS
%doc ChangeLog %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 %files -n %{name}-libs
%defattr(-,root,root) %defattr(-,root,root)
@ -550,7 +565,6 @@ exit 0
%files remote %files remote
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker %config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
%if %{defined _unitdir} %if %{defined _unitdir}
%{_unitdir}/pacemaker_remote.service %{_unitdir}/pacemaker_remote.service
@ -594,6 +608,18 @@ exit 0
%attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/* %attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
%changelog %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 * 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, - Update for new upstream tarball for release candidate: Pacemaker-1.1.15-rc3,
for full details, see included ChangeLog file or for full details, see included ChangeLog file or

2
sources
View File

@ -1,2 +1,2 @@
f51354fa8835c5764aa4278c81a6e6f3 pacemaker-1.1.15-rc3.tar.gz 47e0853494978bb7366a657e1fdfb12f pacemaker-1.1.15.tar.gz
b914b3c0f16d2ba21339fb54e166500e nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz b914b3c0f16d2ba21339fb54e166500e nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz