From ef150d51370f653fb803d07d080510767d9f54cb Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Tue, 26 Apr 2022 16:54:55 +0200 Subject: [PATCH] * Mon Apr 25 2022 Klaus Wenninger - 2.1.3-0.1.rc1 - Update for new upstream tarball for release candidate: Pacemaker-2.1.3-rc1, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.3-rc1 - merged in upstream spec-changes - add nsl-support, remove gnu-coverage - removed explicit BuildRequires for glibc-headers again --- pacemaker.spec | 47 ++++++++++++++++++++--------------------------- sources | 2 +- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/pacemaker.spec b/pacemaker.spec index a7c3ccb..4c5494c 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -31,11 +31,11 @@ ## Upstream pacemaker version, and its package version (specversion ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) -%global pcmkversion 2.1.2 -%global specversion 4 +%global pcmkversion 2.1.3 +%global specversion 0.1.rc1 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build -%global commit ada5c3b36e2adf1703d54d39f40a4b8628eca175 +%global commit a988afd4e796b26b54506e07d3f8db7d3a0b430b ## 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. @@ -55,14 +55,13 @@ %bcond_without cibsecrets %endif +## 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 (or enable, on RHEL) generating documentation -## (the build tools aren't available everywhere) +## Allow deprecated option to skip (or enable, on RHEL) documentation %if 0%{?rhel} %bcond_with doc %else @@ -130,6 +129,7 @@ %global pkgname_libtool_devel_arch libtool-ltdl-devel%{?_isa} %global pkgname_bzip2_devel bzip2-devel %global pkgname_docbook_xsl docbook-style-xsl +%global pkgname_gettext gettext-devel %global pkgname_gnutls_devel gnutls-devel %global pkgname_shadow_utils shadow-utils %global pkgname_procps procps-ng @@ -254,9 +254,6 @@ BuildRequires: make BuildRequires: pkgconfig BuildRequires: sed -# obviously gone from defaults in rawhide -BuildRequires: glibc-headers - # Required for core functionality BuildRequires: pkgconfig(glib-2.0) >= 2.42 BuildRequires: libxml2-devel @@ -271,6 +268,7 @@ BuildRequires: %{pkgname_gnutls_devel} BuildRequires: help2man BuildRequires: ncurses-devel BuildRequires: pam-devel +BuildRequires: %{pkgname_gettext} >= 0.18 # Required for "make check" BuildRequires: libcmocka-devel @@ -314,7 +312,7 @@ when related resources fail and can be configured to periodically check resource health. Available rpmbuild rebuild options: - --with(out) : cibsecrets coverage doc hardening pre_release profiling stonithd + --with(out) : cibsecrets hardening nls pre_release profiling stonithd %package cli License: GPLv2+ and LGPLv2+ @@ -499,8 +497,8 @@ export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}" %{!?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"} \ %{?gnutls_priorities: --with-gnutls-priorities="%{gnutls_priorities}"} \ %{?bug_url: --with-bug-url=%{bug_url}} \ @@ -565,16 +563,6 @@ rm -f %{buildroot}/%{_sbindir}/ipmiservicelogd %endif %endif -%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 - %post %systemd_post pacemaker.service @@ -751,7 +739,7 @@ exit 0 %dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker %dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles -%files -n %{pkgname_pcmk_libs} +%files -n %{pkgname_pcmk_libs} %{?with_nls:-f %{name}.lang} %{_libdir}/libcib.so.* %{_libdir}/liblrmd.so.* %{_libdir}/libcrmservice.so.* @@ -803,9 +791,6 @@ exit 0 %files -n %{pkgname_pcmk_libs}-devel %{_includedir}/pacemaker %{_libdir}/*.so -%if %{with coverage} -%{_var}/lib/pacemaker/gcov -%endif %{_libdir}/pkgconfig/*.pc %license licenses/LGPLv2.1 %doc COPYING @@ -817,6 +802,7 @@ exit 0 %{_datadir}/pacemaker/*.rng %{_datadir}/pacemaker/*.xsl %{_datadir}/pacemaker/api +%{_datadir}/pacemaker/base %{_datadir}/pkgconfig/pacemaker-schemas.pc %files nagios-plugins-metadata @@ -826,6 +812,13 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Apr 25 2022 Klaus Wenninger - 2.1.3-0.1.rc1 +- Update for new upstream tarball for release candidate: Pacemaker-2.1.3-rc1, + for full details, see included ChangeLog file or + https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.3-rc1 +- merged in upstream spec-changes - add nsl-support, remove gnu-coverage +- removed explicit BuildRequires for glibc-headers again + * Thu Jan 27 2022 Klaus Wenninger - 2.1.2-4 - add explicit BuildRequires for glibc-headers to make rawhide build again diff --git a/sources b/sources index afb07df..ae1ac53 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad -SHA512 (pacemaker-ada5c3b36.tar.gz) = a9e8ad459ebd58582c177f831bf9d2476b94f47efa394ecaf3f2a3045368a062e09da6f998340710232145514fcd13f5ecfbe2442fb8672636ea176df1bde7a6 +SHA512 (pacemaker-a988afd4e.tar.gz) = 84fc31615a69cb3647957fffd36e6f18db0e5f039c2282c9f254389f414f26019cf7cbb3e3e598d183474c63f71b17c545e3be0c6d6db556a80e3ff2dce2aa9d