diff --git a/.gitignore b/.gitignore index 96d0ba8..7b35d8c 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,6 @@ /pcs-9240ae694fc17f1cd05c7518856cc61581af4e06.tar.gz /pcs-web-ui-1dcc2142bbba73c758ab2f3d8499156780689e34.tar.gz /pcs-web-ui-node-modules-0.1.23+67-1dcc2.tar.xz +/pcs-0.12.2.tar.gz +/pcs-web-ui-0.1.24.tar.gz +/pcs-web-ui-node-modules-0.1.24.tar.xz diff --git a/do-not-require-wheel.patch b/do-not-require-wheel.patch deleted file mode 100644 index d36a2d5..0000000 --- a/do-not-require-wheel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8895c5c30e7f9d782fcd3a2ed7bc25aa55733922 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 29 Jul 2025 23:42:00 +0200 -Subject: [PATCH] Do not require wheel when setuptools is new enough - -Current version of setuptools creates wheels on its own. ---- - README.md | 2 +- - configure.ac | 7 +++++-- - rpm/pcs.spec.in | 2 +- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/README.md b/README.md -index a06143eba..636485be6 100644 ---- a/README.md -+++ b/README.md -@@ -47,7 +47,7 @@ Apart from the dependencies listed above, these are also required for - installation: - - * python development files (packages python3-devel, python3-setuptools 66.1+, -- python3-pip, python3-wheel) -+ python3-pip, python3-wheel if python3-setuptools < 71) - * ruby development files (package ruby-devel) - * rubygems - * rubygem bundler (package rubygem-bundler or ruby-bundler or bundler) -diff --git a/configure.ac b/configure.ac -index 4e7d36599..0a782bfa7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -347,12 +347,15 @@ AC_SUBST([PYAGENTX_VERSION]) - - # pip 19.0 required for PEP517 support - PCS_CHECK_PYMOD([pip], [>= 23.0]) --# pip builds a wheel first --PCS_CHECK_PYMOD([wheel]) - - if test "x$tests_only" != "xyes"; then - # setuptools 61.0.0 required for PEP621 support - PCS_CHECK_PYMOD([setuptools], [>= 66.1]) -+ # wheel is required if setuptools < 71 -+ AC_PIP_MODULE([setuptools], [>= 71], [], [], [need_wheel=yes]) -+ if test "x$need_wheel" = "xyes"; then -+ PCS_CHECK_PYMOD([wheel]) -+ fi - PCS_CHECK_PYMOD([cryptography]) - PCS_CHECK_PYMOD([lxml]) - PCS_CHECK_PYMOD([pyparsing], [>= 3.0.0]) -diff --git a/rpm/pcs.spec.in b/rpm/pcs.spec.in -index 55881a398..639a3e974 100644 ---- a/rpm/pcs.spec.in -+++ b/rpm/pcs.spec.in -@@ -86,7 +86,7 @@ BuildRequires: python%{python3_version}-pip >= 23 - BuildRequires: python%{python3_version}-setuptools >= 66.1 - - # for building wheel during make install --BuildRequires: python%{python3_version}-wheel -+BuildRequires: (python%{python3_version}-wheel if python%{python3_version}-setuptools < 71) - - # for bundling dateutil - %if "@cirpmworkarounds@" != "yes" --- -2.50.1 - diff --git a/pcs.spec b/pcs.spec index a3ce13b..eac7925 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs -Version: 0.12.1 -Release: 3%{?dist} +Version: 0.12.2 +Release: 1%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPL-2.0-only: pcs @@ -23,7 +23,7 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64 # To build an official pcs release, comment out branch_or_commit # Use long commit hash or branch name to build an unreleased version -%global branch_or_commit 9240ae694fc17f1cd05c7518856cc61581af4e06 +# %%global branch_or_commit 9240ae694fc17f1cd05c7518856cc61581af4e06 %global version_or_commit %{clean_version} %if 0%{?branch_or_commit:1} %global version_or_commit %{branch_or_commit} @@ -33,10 +33,10 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64 # To build an official pcs-web-ui release, comment out ui_branch_or_commit # Last tagged version, also used as fallback version for untagged tarballs -%global ui_version 0.1.23 -%global ui_modules_version 0.1.23+67-1dcc2 +%global ui_version 0.1.24 +%global ui_modules_version 0.1.24 # Use long commit hash or branch name to build an unreleased version -%global ui_branch_or_commit 1dcc2142bbba73c758ab2f3d8499156780689e34 +# %%global ui_branch_or_commit 1dcc2142bbba73c758ab2f3d8499156780689e34 %global ui_version_or_commit %{ui_version} %if 0%{?ui_branch_or_commit:1} %global ui_version_or_commit %{ui_branch_or_commit} @@ -671,6 +671,12 @@ run_all_tests %changelog +* Tue Jan 6 2026 Michal Pospíšil - 0.12.2-1 +- Rebased pcs to the latest sources (see CHANGELOG.md) + Resolves: RHEL-7673, RHEL-47300, RHEL-84120, RHEL-114418 (copy from the changelog) +- Updated HA Cluster Management add-on to 0.1.24 (see CHANGELOG_WUI.md) + Resolves: RHEL-132569 + * Thu Nov 13 2025 Michal Pospíšil - 0.12.1-3 - Rebased pcs to the latest sources (see CHANGELOG.md) Resolves: RHEL-7670, RHEL-21879, RHEL-73527, RHEL-76157, RHEL-76162, RHEL-79044, RHEL-111451, RHEL-126839 diff --git a/sources b/sources index 68bb5bf..d517305 100644 --- a/sources +++ b/sources @@ -16,6 +16,6 @@ SHA512 (nio4r-2.7.5.gem) = 9be8d843506807b279d63f3521f369d036fbc8dfb09578f5ef7eb SHA512 (mustermann-3.0.4.gem) = 5815e898c9b6b3a7126ab17aa7a742c9f81d17ef948ea3cf24d63bbaf196bc004f1e7f439e018d8a32068799fbc8cfda1f0ad6d58e232f96350ff21419550765 SHA512 (ethon-0.18.0.gem) = 4feb6949ce0b183b663600e12ac8c2ff0052769cd7a5f5ae424192198db84883c233a077a2ceea35ef6b34d3bb67b8d15e2a040fa9925fe0c230919e2a61bbf9 SHA512 (backports-3.25.2.gem) = 0c212ca09450a438b6f5ff22950afdaf109327c21c865e04ed717cf67b12d920f3d027bc3fc13a84eafe4d7015ab734f1c2cdaef45449599b57d502f4ccce172 -SHA512 (pcs-9240ae694fc17f1cd05c7518856cc61581af4e06.tar.gz) = 38a0eb73db1bb005bd2c0b4ee8c85934c6c71e83d8e671cacecdd6fe3c06317df0785a9cc3987cb8ad59f4efa7c940b7b815af25254cf9ba048e835456ff8549 -SHA512 (pcs-web-ui-1dcc2142bbba73c758ab2f3d8499156780689e34.tar.gz) = 7ca2dee1172cd27584536eec2c4e4114f9dc22999c813fe7fbba3a4d3b64ceb8c4570f4a6a20fff8f2a94d125d21c4ba0f0f71cbe07a8da1926a6bbd7b2c2be6 -SHA512 (pcs-web-ui-node-modules-0.1.23+67-1dcc2.tar.xz) = 1981e9b33fb44afc636845e1dcb656215c41c6330d475a8e30f247e3fb1cf9133ef27a8736761f10e50f741173091ee281efeaa2b3e0f7ab73c76f0b918d4d9a +SHA512 (pcs-0.12.2.tar.gz) = dacefc4acf7a5857606ddbe4a9dcb539af6288740f564ee565d25bc05cfa9f5a0d72e45262548d8d5c20a4facb5c14c2c70e859f0d4c091acae45e962b99e6ea +SHA512 (pcs-web-ui-0.1.24.tar.gz) = d77f5e22e98354e77b01873e214eac4f01588fb73287e5952a1b4f96b3c96d9818cd96d6d6459bf9e95b61f9c73626f4b1ce527213df26f69dec154ba6398592 +SHA512 (pcs-web-ui-node-modules-0.1.24.tar.xz) = e01f10efd971c7b57708315ffd6ec20af128161287057c8de2bd2fd1b264a5deef09eaff81f721f31de31d1b040516edf9ed9f3407426235f3458b81c68f161f