2.0.0-0.1.rc4 - Update for new upstream tarball
...for release candidate: Pacemaker-2.0.0-rc4, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.0-rc4 . as a special note, previous release candidate, rc3, had rolling upgrades broken, and if that is required, that particular release shall be skipped in the upgrade path altogether Adapt spec file more akin to upstream version including: . as part of the update process, possibly move old log files as implicitly used prior to 2.0 so there's a (limited) continuity with the new implicit location, preventing clutter and confusion (ce2e74c99, 765eb3f24) . move cts-exec-helper from -cli under main package (a2dc2a67e) . -cts backed with new helpers and, tangentially, dummy systemd service file transiently generated on-demand again (fa2d43445, d52b001b1) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný
parent
e7308f95f4
commit
1e37830752
@ -18,7 +18,7 @@
|
||||
|
||||
## Upstream commit (or git tag, such as "Pacemaker-" plus the
|
||||
## {pcmkversion} macro for an official release) to use for this package
|
||||
%global commit Pacemaker-2.0.0-rc3
|
||||
%global commit Pacemaker-2.0.0-rc4
|
||||
## Since git v2.11, the extent of abbreviation is autoscaled by default
|
||||
## (used to be constant of 7), so we need to convey it for non-tags, too.
|
||||
%global commit_abbrev 9
|
||||
@ -51,6 +51,10 @@
|
||||
## less likely to have working versions of the documentation tools
|
||||
%define bleeding %(test ! -e /etc/yum.repos.d/fedora-rawhide.repo; echo $?)
|
||||
|
||||
## Base GnuTLS cipher priorities (presumably only the initial, required keyword)
|
||||
## overridable with "rpmbuild --define 'pcmk_gnutls_priorities PRIORITY-SPEC'"
|
||||
%define gnutls_priorities %{?pcmk_gnutls_priorities}%{!?pcmk_gnutls_priorities:@SYSTEM}
|
||||
|
||||
## Turn off auto-compilation of Python files outside site-packages directory,
|
||||
## so that the -libs-devel package is multilib-compliant (no *.py[co] files)
|
||||
## (py_auto_byte_compile macro: https://bugzilla.redhat.com/574437)
|
||||
@ -64,10 +68,6 @@
|
||||
%define py_site %{?python3_sitelib}%{!?python3_sitelib:%(
|
||||
python3 -c 'from distutils.sysconfig import get_python_lib as gpl; print(gpl(1))' 2>/dev/null)}
|
||||
|
||||
## Base GnuTLS cipher priorities (presumably only the initial, required keyword)
|
||||
## overridable with "rpmbuild --define 'pcmk_gnutls_priorities PRIORITY-SPEC'"
|
||||
%define gnutls_priorities %{?pcmk_gnutls_priorities}%{!?pcmk_gnutls_priorities:@SYSTEM}
|
||||
|
||||
|
||||
# Define conditionals so that "rpmbuild --with <feature>" and
|
||||
# "rpmbuild --without <feature>" can enable and disable specific features
|
||||
@ -157,14 +157,13 @@ BuildRequires: coreutils findutils grep sed
|
||||
|
||||
# Required for core functionality
|
||||
BuildRequires: automake autoconf gcc libtool pkgconfig libtool-ltdl-devel
|
||||
## version lower bound for: g_strcmp0, g_hash_table_iter_init, ...
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.16
|
||||
BuildRequires: libxml2-devel libxslt-devel libuuid-devel
|
||||
BuildRequires: bzip2-devel pam-devel
|
||||
BuildRequires: bzip2-devel
|
||||
|
||||
# Enables optional functionality
|
||||
BuildRequires: ncurses-devel docbook-style-xsl
|
||||
BuildRequires: help2man gnutls-devel pkgconfig(dbus-1)
|
||||
BuildRequires: help2man gnutls-devel pam-devel pkgconfig(dbus-1)
|
||||
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
|
||||
@ -446,7 +445,7 @@ fi
|
||||
# in the future if desired
|
||||
%systemd_postun_with_restart pacemaker_remote.service
|
||||
# Explicitly take care of removing the flag-file(s) upon final removal
|
||||
if [ $1 -eq 0 ] ; then
|
||||
if [ "$1" -eq 0 ] ; then
|
||||
rm -f %{_localstatedir}/lib/rpm-state/%{name}/restart_pacemaker_remote
|
||||
fi
|
||||
|
||||
@ -458,6 +457,13 @@ fi
|
||||
|
||||
%post cli
|
||||
%systemd_post crm_mon.service
|
||||
if [ "$1" = 2 ]; then
|
||||
# Package upgrade, not initial install:
|
||||
# Move any pre-2.0 logs to new location to ensure they get rotated
|
||||
{ mv -fbS.rpmsave %{_var}/log/pacemaker.log* %{_var}/log/pacemaker \
|
||||
|| mv -f %{_var}/log/pacemaker.log* %{_var}/log/pacemaker
|
||||
} >/dev/null 2>/dev/null || :
|
||||
fi
|
||||
|
||||
%preun cli
|
||||
%systemd_preun crm_mon.service
|
||||
@ -494,7 +500,8 @@ exit 0
|
||||
|
||||
%exclude %{_datadir}/pacemaker/nagios/plugins-metadata/*
|
||||
|
||||
%exclude %{_libexecdir}/pacemaker/cts-exec-helper
|
||||
%exclude %{_libexecdir}/pacemaker/cts-log-watcher
|
||||
%exclude %{_libexecdir}/pacemaker/cts-support
|
||||
%exclude %{_sbindir}/pacemaker-remoted
|
||||
%if %{with legacy_links}
|
||||
%exclude %{_sbindir}/pacemaker_remoted
|
||||
@ -554,7 +561,6 @@ exit 0
|
||||
%exclude %{_datadir}/pacemaker/tests
|
||||
%{_datadir}/pacemaker
|
||||
%{_datadir}/snmp/mibs/PCMK-MIB.txt
|
||||
%{_libexecdir}/pacemaker/cts-exec-helper
|
||||
|
||||
%exclude /usr/lib/ocf/resource.d/pacemaker/controld
|
||||
%exclude /usr/lib/ocf/resource.d/pacemaker/o2cb
|
||||
@ -634,7 +640,10 @@ exit 0
|
||||
%files cts
|
||||
%{py_site}/cts
|
||||
%{_datadir}/pacemaker/tests
|
||||
%{_unitdir}/pacemaker-cts-dummyd@.service
|
||||
|
||||
%{_libexecdir}/pacemaker/cts-log-watcher
|
||||
%{_libexecdir}/pacemaker/cts-support
|
||||
|
||||
%license licenses/GPLv2
|
||||
%doc COPYING
|
||||
%doc ChangeLog
|
||||
@ -656,10 +665,28 @@ exit 0
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Wed May 16 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-0.1.rc4
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.0.0-rc4,
|
||||
for full details, see included ChangeLog file or
|
||||
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.0-rc4
|
||||
. as a special note, previous release candidate, rc3, had rolling upgrades
|
||||
broken, and if that is required, that particular release shall be
|
||||
skipped in the upgrade path altogether
|
||||
- Adapt spec file more akin to upstream version including:
|
||||
. as part of the update process, possibly move old log files as implicitly
|
||||
used prior to 2.0 so there's a (limited) continuity with the new implicit
|
||||
location, preventing clutter and confusion (ce2e74c99, 765eb3f24)
|
||||
. move cts-exec-helper from -cli under main package (a2dc2a67e)
|
||||
. -cts backed with new helpers and, tangentially, dummy systemd service
|
||||
file transiently generated on-demand again (fa2d43445, d52b001b1)
|
||||
|
||||
* Wed May 02 2018 Jan Pokorný <jpokorny+rpm-pacemaker@redhat.com> - 2.0.0-0.1.rc3
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.0.0-rc3,
|
||||
for full details, see included ChangeLog file or
|
||||
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.0-rc3
|
||||
. IMPORTANT: this release candidate, rc3, has rolling upgrades broken,
|
||||
and if that is required, this particular release shall be
|
||||
skipped in the upgrade path altogether
|
||||
- Adapt spec file more akin to upstream version including:
|
||||
. new --without legacy_links conditional (c8a7e5225)
|
||||
. reflect name change of the auxiliary daemons
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (pacemaker-2.0.0-rc3.tar.gz) = 4dee3c58d0f2d90c0133ff9c101bfcf563df41d64f5669a72163d85bb6a6db4d70709fd8f08cc07a37dc2e2a77cca133f99104cb67dae57daa354e9174e91c0f
|
||||
SHA512 (pacemaker-2.0.0-rc4.tar.gz) = 7aef6e5f1d640545227dc4ac5e569b60e5e67919041a24ee8c1cbfda0bc22d7c64f32fb8ba583d7a83a0fbb00d8417f8a31c172af5daffcf0013c93015bc1333
|
||||
SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
|
||||
|
||||
Loading…
Reference in New Issue
Block a user