Accepting request 979418 from network:ha-clustering:Factory

- Use the project upstream name for the -devel subpackage
  (rename libpacemaker-devel to pacemaker-devel).
- Drop libpacemaker3-cluster separation, since it double-ships
  a file that is already in libpacemaker3
- Rename libpacemaker3 to pacmekaer-libs following packages like
  xrootd-libs et al so it does not get picked on by rpmlint
  [boo#1191752].

- Update to version 2.1.2+20220526.b387f8972:
- libcrmcommon: avoid memory leak if IPC server fails to run
- nls: format of XML-escaped string

- Update to version 2.1.2+20220518.dff7c3a72 (Pacemaker-2.1.3-rc2):
- schemas: Use fence-event-2.15.rng (rh#2086230)
- scheduler: don't support versioned instance attributes in operations
- schemas: allow Promoted/Unpromoted in crm_resource output

- Update to version 2.1.2+20220511.0bf080da3:
- tools: Set options.command when "attrd_updater -Y" is used.

- Update to version 2.1.2+20220427.c01a90fd2:
- tools: Hook up the verbosity flag in crm_attribute.
- tools: Honor CIB_file when doing node name lookups in crm_attribute.
- tools: Handle a remote node's name differing from its hostname.
- libcrmcommon: Fix a bug in processing multiple IPC messages.
- libcrmcommon: Add EAGAIN as a return code from crm_ipc_read.
- libcrmcommon: Handle IPC ACKs from proxied connections too.
- fenced: Correctly log the total fencing timeout.
- scheduler: make multiple-active="stop_unexpected" actually work
- libcib: Check for NULL before calling g_ascii_strdown.

OBS-URL: https://build.opensuse.org/request/show/979418
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=143
This commit is contained in:
Dominique Leuenberger 2022-05-30 10:42:33 +00:00 committed by Git OBS Bridge
commit ab2ea1c07a
7 changed files with 153 additions and 65 deletions

View File

@ -11,7 +11,7 @@
<param name="version">2.1.2</param>
-->
<param name="versionformat">2.1.2+%cd.%h</param>
<param name="revision">1ad8bbddd</param>
<param name="revision">b387f8972</param>
<param name="changesgenerate">enable</param>
</service>

View File

@ -5,4 +5,4 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">771ee9c3cde07bbceea7ba818cfe24c4fb08ad79</param></service></servicedata>
<param name="changesrevision">761f125623a4e46b827bc07013fdf930b08aa802</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa9653d32c5cdfce904f970804b300c37bcfc62773611d11bc2784075b767fd3
size 3547312

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a6933d37a40c1868bc60417420e48312006e64d13b6aa184fd923d446330e05
size 3557352

View File

@ -1,3 +1,117 @@
-------------------------------------------------------------------
Thu May 26 19:24:22 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Use the project upstream name for the -devel subpackage
(rename libpacemaker-devel to pacemaker-devel).
- Drop libpacemaker3-cluster separation, since it double-ships
a file that is already in libpacemaker3
- Rename libpacemaker3 to pacmekaer-libs following packages like
xrootd-libs et al so it does not get picked on by rpmlint
[boo#1191752].
-------------------------------------------------------------------
Thu May 26 18:56:57 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220526.b387f8972:
- libcrmcommon: avoid memory leak if IPC server fails to run
- nls: format of XML-escaped string
-------------------------------------------------------------------
Thu May 26 18:46:07 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220518.dff7c3a72 (Pacemaker-2.1.3-rc2):
- schemas: Use fence-event-2.15.rng (rh#2086230)
- scheduler: don't support versioned instance attributes in operations
- schemas: allow Promoted/Unpromoted in crm_resource output
-------------------------------------------------------------------
Thu May 12 07:56:23 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220511.0bf080da3:
- tools: Set options.command when "attrd_updater -Y" is used.
-------------------------------------------------------------------
Mon May 02 10:01:36 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220427.c01a90fd2:
- tools: Hook up the verbosity flag in crm_attribute.
- tools: Honor CIB_file when doing node name lookups in crm_attribute.
- tools: Handle a remote node's name differing from its hostname.
- libcrmcommon: Fix a bug in processing multiple IPC messages.
- libcrmcommon: Add EAGAIN as a return code from crm_ipc_read.
- libcrmcommon: Handle IPC ACKs from proxied connections too.
- fenced: Correctly log the total fencing timeout.
- scheduler: make multiple-active="stop_unexpected" actually work
- libcib: Check for NULL before calling g_ascii_strdown.
-------------------------------------------------------------------
Mon May 02 08:44:22 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220421.a988afd4e (Pacemaker-2.1.3-rc1):
- libpe_status: deprecate node_ping
- fencer: avoid core dump at exit
- fix Chinese garbled
- fencer: don't use constant within translatable string literal
- libcrmcommon: fix NLS issues with option meta-data
-------------------------------------------------------------------
Fri Apr 29 15:42:58 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220414.8cfa69660:
- tools: set command for `crm_resource -q/--query-xml` before changing any options (bsc#1198409)
- tools: prevent possible crm_resource segfaults if multiple commands are specified (bsc#1198409)
- tools: set commands in crm_resource before changing any options (bsc#1198409)
-------------------------------------------------------------------
Fri Apr 29 15:30:44 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220412.826f287ac:
- schemas: update some API schemas for node health change
- tools: add node health to crm_mon output
- libpe_status: tweak HTML output for node names
- libcrmcommon: tweak HTML CSS
- libpe_status: show node status components in separate HTML spans
- libpe_status: remove stray space from HTML class name
-------------------------------------------------------------------
Fri Apr 29 13:42:20 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220412.bd19767c9:
- libcib: Fix handling the return value of cib_internal_op.
-------------------------------------------------------------------
Fri Apr 29 10:43:11 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220408.6321f6534:
- libcrmcommon: bump feature set for multiple-active=stop_unexpected
- scheduler: implement multiple-active=stop_unexpected
- scheduler: log a warning if invalid value is given for multiple-active
-------------------------------------------------------------------
Fri Apr 29 10:06:55 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220407.844c3972e:
- scheduler: allow-unhealthy-nodes resource meta-attribute
-------------------------------------------------------------------
Wed Apr 20 12:44:15 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220407.56d93678c:
- tools: Handle an error case in crm_attribute.
- tools: Convert crm_ticket to using glib for command line.
-------------------------------------------------------------------
Wed Apr 06 11:19:17 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220405.1ec3db01e:
- schemas: Add host= to crm_attribute schema.
- libpacemaker: Don't output attribute settings for blank strings.
- tools: Override the attribute text message in crm_attribute.
- tools: Use the new attribute message in attrd_updater.
- libpacemaker: Add host to the attribute message.
- tools: Add formatted output boilerplate to attrd_updater.
- fencer: drop useless logs
-------------------------------------------------------------------
Sun Apr 3 07:44:37 UTC 2022 - Stephan Kulow <coolo@suse.com>
@ -28,7 +142,7 @@ Tue Mar 29 06:49:24 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220328.24d87d0b2:
- tools: Do not allow certain operations on clone instances.
- tools: Fix one method of restarting a cloned group.
- tools: Fix restarting clone instances in crm_resource.
- tools: Fix restarting clone instances in crm_resource. (rh#1930578)
- tools: If crm_resource is given an invalid node, error.
- tools: Fix one way to restart a cloned primitive.
- tools: Fix restarting implicit bundled resources without a host.
@ -1056,7 +1170,7 @@ Fri Mar 19 13:28:44 UTC 2021 - Yan Gao <ygao@suse.com>
Tue Mar 16 17:04:01 UTC 2021 - Yan Gao <ygao@suse.com>
- Update to version 2.0.5+20210114.ad074d869:
- all: use high-resolution timestamps in detail log when available
- all: use high-resolution timestamps in detail log when available (bsc#1197668)
- CIB: remove cibmon command
-------------------------------------------------------------------

View File

@ -2,4 +2,3 @@ addFilter("script-without-shebang /usr/share/pacemaker/.*\.rng")
addFilter("script-without-shebang /usr/share/pacemaker/.*\.dtd")
addFilter("script-without-shebang /usr/share/pacemaker/.*\.xsl")
addFilter("non-executable-script /usr/share/pacemaker/cts/")
addFilter("shlib-policy-name-error")

View File

@ -47,8 +47,7 @@
## Add option to create binaries suitable for use with profiling tools
%bcond_with profiling
## Add option to skip generating documentation
## (the build tools aren't available everywhere)
## Allow deprecated option to skip or enable documentation
%bcond_with doc
## Add option to default to start-up synchronization with SBD.
@ -100,12 +99,12 @@
%endif
%define with_nagios 1
%define enable_lib_cluster_pkg 0
%define enable_cluster_libs_pkg 0
%define enable_fatal_warnings 0
%define with_regression_tests 0
Name: pacemaker
Version: 2.1.2+20220331.1ad8bbddd
Version: 2.1.2+20220526.b387f8972
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -163,7 +162,6 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(uuid)
Requires: %{name}-cli = %{version}-%{release}
Requires: corosync >= 2.0.0
Requires: libpacemaker3 = %{version}-%{release}
Requires: psmisc
Requires: python3
Requires: resource-agents
@ -177,9 +175,6 @@ Conflicts: libheartbeat2 < 3.0.0
Provides: pacemaker-ticket-support = 2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%if %{enable_lib_cluster_pkg}
Requires: libpacemaker3-cluster = %{version}-%{release}
%endif
# Enables optional functionality
%if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets
@ -188,7 +183,7 @@ BuildRequires: docbook-style-xsl
%endif
%if %{with stonithd}
%if 0%{?suse_version}
BuildRequires: libglue-devel
BuildRequires: cluster-glue-devel
%else
BuildRequires: cluster-glue-libs-devel
%endif
@ -218,7 +213,6 @@ resource health.
%package cli
Summary: Command line tools for controlling Pacemaker clusters
Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version}-%{release}
Requires: logrotate
Requires: perl-TimeDate
Requires: procps
@ -236,9 +230,9 @@ The %{name}-cli package contains command line tools that can be used
to query and control the cluster from machines that may, or may not,
be part of the cluster.
%package -n libpacemaker3
%package libs
Summary: Core Pacemaker libraries
Group: Productivity/Clustering/HA
Group: System/Libraries
Requires(pre): shadow
# sbd 1.4.0+ supports the libpe_status API for pe_working_set_t
# sbd 1.4.2+ supports startup/shutdown handshake via pacemakerd-api
@ -246,31 +240,31 @@ Requires(pre): shadow
# sbd 1.5.0+ handshake defaults to enabled with upstream sbd-release
# implicitly supports handshake defaults to enabled in this spec
Conflicts: sbd < 1.5.0
Conflicts: libpacemaker3
Obsoletes: libpacemaker3
%description -n libpacemaker3
%description libs
Pacemaker is an advanced, scalable High-Availability cluster resource
manager.
The libpacemaker3 package contains shared libraries needed for cluster
The pacemaker-libs package contains shared libraries needed for cluster
nodes and those just running the CLI tools.
%package -n libpacemaker3-cluster
%package cluster-libs
Summary: Cluster Libraries used by Pacemaker
Group: Productivity/Clustering/HA
Requires: libpacemaker3 = %{version}-%{release}
Group: System/Libraries
%description -n libpacemaker3-cluster
%description cluster-libs
Pacemaker is an advanced, scalable High-Availability cluster resource
manager.
The libpacemaker3-cluster package contains cluster-aware shared
The pacemaker-cluster-libs package contains cluster-aware shared
libraries needed for nodes that will form part of the cluster nodes.
%package remote
Summary: Pacemaker remote executor daemon for non-cluster nodes
Group: Productivity/Clustering/HA
Requires: %{name}-cli = %{version}-%{release}
Requires: libpacemaker3 = %{version}-%{release}
Requires: procps
Requires: resource-agents
%{?systemd_requires}
@ -283,10 +277,10 @@ The %{name}-remote package contains the Pacemaker Remote daemon
which is capable of extending pacemaker functionality to remote
nodes not running the full corosync/cluster stack.
%package -n libpacemaker-devel
%package devel
Summary: Pacemaker development package
Group: Development/Libraries/C and C++
Requires: libpacemaker3 = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: libtool-ltdl-devel
Requires: pkgconfig
Requires: pkgconfig(bzip2)
@ -296,8 +290,8 @@ Requires: pkgconfig(libqb)
Requires: pkgconfig(libxml-2.0)
Requires: pkgconfig(libxslt)
Requires: pkgconfig(uuid)
%if %{enable_lib_cluster_pkg}
Requires: libpacemaker3-cluster = %{version}-%{release}
%if %{enable_cluster_libs_pkg}
Requires: %{name}-cluster-libs = %{version}-%{release}
%endif
%if %{with_regression_tests}
# For the regression tests, we can run them only if all pacemaker
@ -306,11 +300,11 @@ Requires: libpacemaker3-cluster = %{version}-%{release}
Requires: pacemaker
%endif
%description -n libpacemaker-devel
%description devel
Pacemaker is an advanced, scalable High-Availability cluster resource
manager.
The libpacemaker-devel package contains headers and shared libraries
The pacemaker-devel package contains headers and shared libraries
for developing tools for Pacemaker.
%package cts
@ -339,17 +333,7 @@ Pacemaker is an advanced, scalable High-Availability cluster resource
manager.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%autosetup -p1
%build
@ -490,21 +474,21 @@ fi
%postun cli
%service_del_postun crm_mon.service
%pre -n libpacemaker3
%pre libs
getent group %{gname} >/dev/null || groupadd -r %{gname} -g %{hacluster_id}
getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u %{hacluster_id} -s /sbin/nologin -c "cluster user" %{uname}
exit 0
%post -n libpacemaker3 -p /sbin/ldconfig
%postun -n libpacemaker3 -p /sbin/ldconfig
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%if %{enable_lib_cluster_pkg}
%post -n libpacemaker3-cluster -p /sbin/ldconfig
%postun -n libpacemaker3-cluster -p /sbin/ldconfig
%if %{enable_cluster_libs_pkg}
%post cluster-libs -p /sbin/ldconfig
%postun clsuter-libs -p /sbin/ldconfig
%endif
%if %{with_regression_tests}
%post -n libpacemaker-devel
%post devel
if [ ! -e /tmp/.pcmk_regression_tests_ran ]; then
touch /tmp/.pcmk_regression_tests_ran
# Needed so that the shell doesn't get stuck on escape
@ -516,7 +500,6 @@ fi
%endif
%files
%defattr(-,root,root)
%{_defaultdocdir}/%{name}/
%{_sbindir}/pacemakerd
@ -555,7 +538,6 @@ fi
%{ocf_root}/resource.d/pacemaker/remote
%files cli
%defattr(-,root,root)
%dir %attr (750, root, %{gname}) %{_sysconfdir}/pacemaker
%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%{_unitdir}/crm_mon.service
@ -622,9 +604,7 @@ fi
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
%files -n libpacemaker3 %{?with_nls:-f %{name}.lang}
%defattr(-,root,root)
%files libs %{?with_nls:-f %{name}.lang}
%{_libdir}/libcib.so.*
%{_libdir}/liblrmd.so.*
%{_libdir}/libcrmservice.so.*
@ -637,16 +617,14 @@ fi
%doc COPYING ChangeLog
%{_libdir}/libcrmcluster.so.*
%if %{enable_lib_cluster_pkg}
%files -n libpacemaker3-cluster
%defattr(-,root,root)
%if %{enable_cluster_libs_pkg}
%files cluster-libs
%{_libdir}/libcrmcluster.so.*
#%license licenses/LGPLv2.1
%doc COPYING ChangeLog
%endif
%files remote
%defattr(-,root,root)
%{_unitdir}/pacemaker_remote.service
%{_sbindir}/rcpacemaker_remote
@ -658,13 +636,11 @@ fi
%if %{with doc}
%files doc
%defattr(-,root,root)
%doc %{pcmk_docdir}
#%license licenses/CC-BY-SA-4.0
%endif
%files cts
%defattr(-,root,root)
%{python3_sitelib}/cts
%{_datadir}/pacemaker/tests
@ -674,8 +650,7 @@ fi
#%license licenses/GPLv2
%doc COPYING ChangeLog
%files -n libpacemaker-devel
%defattr(-,root,root)
%files devel
%{_includedir}/pacemaker
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc