From f442c8354ae908464c7a6bbd9a8bb770184377eb Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Thu, 2 Jan 2025 10:20:21 -0500 Subject: [PATCH] Rebase on upstream 3.0.0-rc3 - Log warnings if XSL transforms cannot preserve previous behavior - Ensure XSL transforms do not invalidate ACLs - Remove build dependency on inkscape - Resolves: RHEL-62096 - Resolves: RHEL-62722 --- pacemaker.spec | 13 ++++++++++--- sources | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pacemaker.spec b/pacemaker.spec index 3e7df07..28adfc8 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -41,10 +41,10 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 3.0.0 -%global specversion 3 +%global specversion 4 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build -%global commit 4ae3a303e589ed47634890aab5dd955186b5ec02 +%global commit 2587987be9f440c1f292233a8adea785f16641c5 ## 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. @@ -274,7 +274,6 @@ BuildRequires: %{pkgname_glue_libs}-devel %if %{with doc} BuildRequires: asciidoc -BuildRequires: inkscape BuildRequires: %{python_name}-sphinx %endif @@ -791,6 +790,14 @@ exit 0 %{_datadir}/pkgconfig/pacemaker-schemas.pc %changelog +* Thu Jan 02 2025 Chris Lumens - 3.0.0-4 +- Rebase on upstream 3.0.0-rc3 +- Log warnings if XSL transforms cannot preserve previous behavior +- Ensure XSL transforms do not invalidate ACLs +- Remove build dependency on inkscape +- Resolves: RHEL-62096 +- Resolves: RHEL-62722 + * Thu Dec 12 2024 Chris Lumens - 3.0.0-3 - Rebase on upstream 3.0.0-rc2 - Support X.509 certificates for Pacemaker Remote connections and remote diff --git a/sources b/sources index 21c2111..70ee64f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pacemaker-4ae3a303e.tar.gz) = 3715efbf45ee4b0b611984ff6e33b77c38362f242e5ae4d65549251f99921fa61b1456e5cfe5cc2f3dd5a6a0907a6e46e16ec35e19ce3a8d1f4db1092a29d619 +SHA512 (pacemaker-2587987be.tar.gz) = 2f3cc2ea8459956d4d0c69eb32aed69e263004c44bf73bbd37e63c542e318e300816bfcd6121500ac25980163936b8cc38293171e6d250bf1d34910ae62320d6