diff --git a/_service b/_service
index 11da6ca..d4d61d7 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
2.1.2
-->
2.1.2+%cd.%h
- 16c1bab10
+ 1ad8bbddd
enable
diff --git a/_servicedata b/_servicedata
index 513441a..ab275f8 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,8 @@
- https://github.com/ClusterLabs/pacemaker.git
- 16928cfc69136bc56b1574bee9966e0d5de73abd
+ git://github.com/ClusterLabs/pacemaker.git
+ 022ae2d5fa54b0b213595be31a90424f021f5b71
-
+
+ https://github.com/ClusterLabs/pacemaker.git
+ 771ee9c3cde07bbceea7ba818cfe24c4fb08ad79
\ No newline at end of file
diff --git a/pacemaker-2.1.2+20220126.16c1bab10.tar.xz b/pacemaker-2.1.2+20220126.16c1bab10.tar.xz
deleted file mode 100644
index 4265ad3..0000000
--- a/pacemaker-2.1.2+20220126.16c1bab10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e0ebb2c430727717ed2ac5471411e1692d8b9df57c9fd4d3ff985c363a3ebea
-size 3526768
diff --git a/pacemaker-2.1.2+20220331.1ad8bbddd.tar.xz b/pacemaker-2.1.2+20220331.1ad8bbddd.tar.xz
new file mode 100644
index 0000000..fe68247
--- /dev/null
+++ b/pacemaker-2.1.2+20220331.1ad8bbddd.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa9653d32c5cdfce904f970804b300c37bcfc62773611d11bc2784075b767fd3
+size 3547312
diff --git a/pacemaker.changes b/pacemaker.changes
index 4b81d2e..8fa8e06 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,163 @@
+-------------------------------------------------------------------
+Sun Apr 3 07:44:37 UTC 2022 - Stephan Kulow
+
+- Create libltdl/config before autoreconf to fix an incompatibility
+ with autoconf 2.71
+
+-------------------------------------------------------------------
+Fri Apr 01 11:35:32 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220331.1ad8bbddd:
+- tools: Fix the -v option to attrd_updater.
+
+-------------------------------------------------------------------
+Wed Mar 30 09:22:01 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220329.efdcb0bbf:
+- resources: Add an OCF_RESKEY_dampen parameter to HealthSMART.
+- resources: Mark HealthSMART parameters as reloadable.
+- resources: Also fix HealthSMART_monitor.
+- resources: Fix a bug in init_smart in HealthSMART.
+- resources: Fix the stop action in HealthSMART.
+- resources: Add an OCF_RESKEY_smartctl parameter to HealthSMART.
+- resources: update HealthSMART agent for OCF 1.1
+
+-------------------------------------------------------------------
+Tue Mar 29 06:49:24 UTC 2022 - Yan Gao
+
+- 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: 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.
+- tools: Fix double free errors in crm_resource.
+- tools: Compare host names case insensitively...
+
+-------------------------------------------------------------------
+Mon Mar 28 15:43:15 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220328.2dd22a9d7:
+- tools: Update a couple option help strings in attrd_updater.
+- Convert attrd_updater to use glib for cmdline handling.
+
+-------------------------------------------------------------------
+Thu Mar 24 10:48:40 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220322.5129e5ca5:
+- tools: Add XML schema for the crm_attribute output.
+- tools: Fix indentation on crm_attribute help output.
+- tools: Finish using formatted output in crm_attribute.
+- tools: Switch crm_attribute to use formatted output.
+- schemas: Add a schema for the new crm_rule output.
+- tools: Allow passing -r to crm_rule more than once.
+- tools: crm_rule is no longer experimental.
+- tools: Convert crm_rule to formatted output.
+- rpm: Remove the coverage support from the spec file.
+
+-------------------------------------------------------------------
+Thu Mar 24 10:16:01 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220309.d007690cb:
+- cibadmin to be able to "render" access mode for selected user
+
+-------------------------------------------------------------------
+Tue Mar 08 15:49:01 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220307.022ae2d5f:
+- rpm: depend on gettext-tools instead of gettext
+- scheduler: Take case into account when finding resources.
+- scheduler: improve fencing-related messages
+
+-------------------------------------------------------------------
+Mon Mar 07 13:34:25 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220304.b2c456e77:
+- pacemakerd: override locale earlier in start-up
+- libcrmcommon: initialize NLS only once
+- tools: Fix a corner case in crm_mon outputting.
+- tools: Always output to the HTML dest file. (clbz#5492)
+- scheduler: shutdown locks apply to group members, not group itself
+
+-------------------------------------------------------------------
+Wed Mar 02 13:02:01 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220301.6981b549a:
+- libpacemaker: Fix a segfault in crm_mon.
+
+-------------------------------------------------------------------
+Wed Mar 02 12:54:59 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220301.a5db0024f:
+- scheduler: properly set data set flags when scheduling actions
+- scheduler: determine cluster status more efficiently
+
+-------------------------------------------------------------------
+Wed Mar 02 11:43:06 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220222.250a6b0d7:
+- rpm: add nls option
+
+-------------------------------------------------------------------
+Mon Feb 21 12:13:47 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220217.578a0bc42:
+- libpacemaker: Add a public function for one-shot crm_mon mode.
+
+-------------------------------------------------------------------
+Thu Feb 17 18:05:59 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220216.41a118c10:
+- NLS: expand translations to all executables
+- libcrmcommon: match allocation and free functions
+- executor: improve alert completion messages
+- libcrmservice: improve exit reasons for timeouts/signals
+- libcrmservice,tools: add more detail to exit reasons when available
+- controller: don't retry an invalid remote key
+- controller,fencer: add more detail to exit reasons when available
+- scheduler: improve "friendly" failed action output
+- libcrmservice: improve timeout message for alert agents
+- fencing: assert that fencing actions are non-recurring
+- libcrmservice: check parameter for NULL before dereferencing it
+- scheduler: improve messages for action configuration changes
+
+-------------------------------------------------------------------
+Thu Feb 17 17:22:45 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220215.aa3779ec6:
+- Add pacemaker(pacemaker-based) resource translatefile
+
+-------------------------------------------------------------------
+Thu Feb 17 17:13:59 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220215.c0ac153b7:
+- libcrmcommon: Escape option metadata descriptions. (rh#2050259)
+- libcrmservice: Escape systemd agent descriptions. (rh#2050259)
+
+-------------------------------------------------------------------
+Thu Feb 17 17:11:27 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220215.80e43ec90:
+- libcrmservice: Additional metadata fix for systemd templates. (rh#2045096)
+
+-------------------------------------------------------------------
+Tue Feb 15 12:26:08 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220214.81e6a29e4:
+- daemons: Add a longdesc to the pcmk_host_list parameter.
+- daemons: Put shortdesc after longdesc for parameters, too. (rh#2049722)
+- resources: Put shortdesc after longdesc in agents. (rh#2049722)
+
+-------------------------------------------------------------------
+Tue Feb 08 13:40:56 UTC 2022 - Yan Gao
+
+- Update to version 2.1.2+20220207.58dccbae0:
+- libcommon: avoid race when process checked while going away
+- pkg-config: libpacemaker requires libstonithd and libcrmservice.
+- scheduler: assert on notification entry memory errors
+- scheduler: avoid notification problems if node names are unknown
+
-------------------------------------------------------------------
Tue Feb 08 11:57:53 UTC 2022 - Yan Gao
diff --git a/pacemaker.spec b/pacemaker.spec
index 108fdbe..28fb156 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -41,12 +41,12 @@
## Add option to enable support for storing sensitive information outside CIB
%bcond_without cibsecrets
+## Add option to enable Native Language Support (experimental)
+%bcond_with nls
+
## Add option to create binaries suitable for use with profiling tools
%bcond_with profiling
-## Add option to create binaries with coverage analysis
-%bcond_with coverage
-
## Add option to skip generating documentation
## (the build tools aren't available everywhere)
%bcond_with doc
@@ -105,7 +105,7 @@
%define with_regression_tests 0
Name: pacemaker
-Version: 2.1.2+20220126.16c1bab10
+Version: 2.1.2+20220331.1ad8bbddd
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@@ -134,6 +134,7 @@ BuildRequires: coreutils
BuildRequires: fdupes
BuildRequires: findutils
BuildRequires: gcc
+BuildRequires: gettext-tools >= 0.18
BuildRequires: grep
BuildRequires: help2man
BuildRequires: libtool
@@ -366,6 +367,7 @@ export LDFLAGS_HARDENED_EXE="%{?_hardening_ldflags}"
export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
%endif
+mkdir -p libltdl/config
autoreconf -fvi
%configure \
@@ -382,8 +384,8 @@ autoreconf -fvi
%{!?with_hardening: --disable-hardening} \
%{?with_legacy_links: --enable-legacy-links} \
%{?with_profiling: --with-profiling} \
- %{?with_coverage: --with-coverage} \
%{?with_cibsecrets: --with-cibsecrets} \
+ %{?with_nls: --enable-nls} \
%{?with_sbd_sync: --with-sbd-sync-default="true"} \
%{?bug_url: --with-bug-url=%{bug_url}} \
%{?ocf_root: --with-ocfdir=%{ocf_root}} \
@@ -405,6 +407,10 @@ install -d -m755 %{buildroot}%{_fillupdir}
install -m 644 etc/sysconfig/pacemaker %{buildroot}%{_fillupdir}/sysconfig.pacemaker
install -m 644 etc/sysconfig/crm_mon %{buildroot}%{_fillupdir}/sysconfig.crm_mon
+%if %{with nls}
+%find_lang %{name}
+%endif
+
# Don't package static libs
find %{buildroot} -type f -name "*.a" -delete -print
# Don't package libtool archives
@@ -416,16 +422,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
rm -f %{buildroot}/%{_sbindir}/notifyServicelogEvent
rm -f %{buildroot}/%{_sbindir}/ipmiservicelogd
-%if %{with coverage}
-GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
-mkdir -p $GCOV_BASE
-find . -name '*.gcno' -type f | while read F ; do
- D=`dirname $F`
- mkdir -p ${GCOV_BASE}/$D
- cp $F ${GCOV_BASE}/$D
-done
-%endif
-
ln -s service %{buildroot}%{_sbindir}/rcpacemaker
ln -s service %{buildroot}%{_sbindir}/rcpacemaker_remote
ln -s service %{buildroot}%{_sbindir}/rccrm_mon
@@ -626,7 +622,7 @@ fi
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
-%files -n libpacemaker3
+%files -n libpacemaker3 %{?with_nls:-f %{name}.lang}
%defattr(-,root,root)
%{_libdir}/libcib.so.*
@@ -682,9 +678,6 @@ fi
%defattr(-,root,root)
%{_includedir}/pacemaker
%{_libdir}/*.so
-%if %{with coverage}
-%{_var}/lib/pacemaker/gcov
-%endif
%{_libdir}/pkgconfig/*.pc
#%license licenses/LGPLv2.1
%doc COPYING ChangeLog