rpms/pcs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

pcs-0.11.8-3.el8

Browse Source 
- Rebased pcs to the latest sources (see CHANGELOG.md)
  Resolves: RHEL-46303, RHEL-69040
- Rebased pcs-web-ui to the latest sources
  Resolves: RHEL-69272, RHEL-69278, RHEL-69279, RHEL-69280, RHEL-69281, RHEL-69282

- Revamped and unified tarball version management between pcs and pcs-web-ui - version numbers are needed for untagged releases, as git-version-gen takes the version from a git tag present in official released tarballs. To build an unreleased version of pcs, a commit hash is declared in a macro and .tarball-version is generated from rpm version and the hash. For tagged releases, .tarball-version is not generated but rpm version is used for file names and such. Pcs-web-ui uses a different version than pcs, so the rpm version cannot be used. Instead, pcs-web-ui version always has to be declared in the spec file anyway, so it will now serve as the fallback version for generating the .tarball-version for pcs-web-ui.
- Putting autosetup and autopatch back for pcs-web-ui
This commit is contained in:
Michal Pospíšil 2024-12-16 19:24:05 +01:00
parent 25f11df46c
commit 75664737d2
3 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -250,3 +250,5 @@
/pcs-web-ui-0.1.21.tar.gz /pcs-web-ui-0.1.21.tar.gz
/pcs-web-ui-node-modules-0.1.21.tar.xz /pcs-web-ui-node-modules-0.1.21.tar.xz
/pcs-7096a208ff39419c5a733ec68e0fe85cbc1611db.tar.gz /pcs-7096a208ff39419c5a733ec68e0fe85cbc1611db.tar.gz
/pcs-73c3ba7aec1e2abf2ef7c3d0ffddeeef7c7516d0.tar.gz
/pcs-web-ui-34372d1268f065ed186546f55216aaa2d7e76b54.tar.gz

53
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.11.8 Version: 0.11.8
Release: 2%{?dist} Release: 3%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs # GPL-2.0-only: pcs
@ -17,15 +17,28 @@ Summary: Pacemaker/Corosync Configuration System
#building only for architectures with pacemaker and corosync available #building only for architectures with pacemaker and corosync available
ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
# When specifying a commit, use its long hash # To build an official pcs release, comment out branch_or_commit
# %%global version_or_commit %%{version} # Use long commit hash or branch name to build an unreleased version
%global version_or_commit 7096a208ff39419c5a733ec68e0fe85cbc1611db %global branch_or_commit 73c3ba7aec1e2abf2ef7c3d0ffddeeef7c7516d0
%if "x{?branch_or_commit}" == "x"
%global version_or_commit %{clean_version}
%else
%global version_or_commit %{branch_or_commit}
%endif
%global pcs_source_name %{name}-%{version_or_commit} %global pcs_source_name %{name}-%{version_or_commit}
# ui_commit can be determined by hash, tag or branch # To build an official pcs-web-ui release, comment out ui_branch_or_commit
%global ui_commit 0.1.21 # Last tagged version, also used as fallback version for untagged tarballs
%global ui_version 0.1.21
# Use long commit hash or branch name to build an unreleased version
%global ui_branch_or_commit 34372d1268f065ed186546f55216aaa2d7e76b54
%if "x{?ui_branch_or_commit}" == "x"
%global ui_version_or_commit %{ui_version}
%else
%global ui_version_or_commit %{ui_branch_or_commit}
%endif
%global ui_src_name pcs-web-ui-%{ui_version_or_commit}
%global ui_modules_version 0.1.21 %global ui_modules_version 0.1.21
%global ui_src_name pcs-web-ui-%{ui_commit}
%global pcs_snmp_pkg_name pcs-snmp %global pcs_snmp_pkg_name pcs-snmp
@ -90,8 +103,8 @@ Source94: https://rubygems.org/downloads/base64-%{version_rubygem_base64}.gem
Source95: https://rubygems.org/downloads/rack-session-%{version_rubygem_rack_session}.gem Source95: https://rubygems.org/downloads/rack-session-%{version_rubygem_rack_session}.gem
Source96: https://rubygems.org/downloads/rackup-%{version_rubygem_rackup}.gem Source96: https://rubygems.org/downloads/rackup-%{version_rubygem_rackup}.gem
Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_version_or_commit}/%{ui_src_name}.tar.gz
Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_version_or_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz
# pcs patches: <= 200 # pcs patches: <= 200
# Patch0: bzNUMBER-01-name.patch # Patch0: bzNUMBER-01-name.patch
@ -284,21 +297,18 @@ update_times_patch(){
# * http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # * http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html
# * https://rpm-software-management.github.io/rpm/manual/autosetup.html # * https://rpm-software-management.github.io/rpm/manual/autosetup.html
# patch web-ui sources # patch web-ui sources
# -q limits verbosity of %setup macro. Only tar -xof is executed instead of tar
# -xvvof. This option has to be used as first.
# This option is used to suppress a listing of all node_modules files that is
# too long and exceeds capacity of CI log
# -n <name> — Set Name of Build Directory # -n <name> — Set Name of Build Directory
# -T — Do Not Perform Default Archive Unpacking # -T — Do Not Perform Default Archive Unpacking
# -b <n> — Unpack The nth Sources Before Changing Directory # -b <n> — Unpack The nth Sources Before Changing Directory
# -a <n> — Unpack The nth Sources After Changing Directory # -a <n> — Unpack The nth Sources After Changing Directory
# -N — disables automatic patch application, use autopatch to apply patches
# #
# 1. unpack sources (-b 0) # 1. unpack sources (-b 0)
# 2. then cd into sources tree (the setup macro itself) # 2. then cd into sources tree (the setup macro itself)
# 3. then unpack node_modules into sources tree (-a 1). # 3. then unpack node_modules into sources tree (-a 1).
%setup -q -T -b 100 -a 101 -n %{ui_src_name} %autosetup -T -b 100 -a 101 -N -n %{ui_src_name}
# patching is handled by applying the individual patches %autopatch -p1 -m 201
# %%patch -P201
# update_times_patch %%{PATCH201} # update_times_patch %%{PATCH201}
@ -314,6 +324,11 @@ update_times_patch %{PATCH0}
echo "%version+$(echo "%{version_or_commit}" | head -c 8)" > %{_builddir}/%{pcs_source_name}/.tarball-version echo "%version+$(echo "%{version_or_commit}" | head -c 8)" > %{_builddir}/%{pcs_source_name}/.tarball-version
%endif %endif
%if "x%{?ui_branch_or_commit}" != "x"
echo "%{ui_version}+$(echo "%{ui_branch_or_commit}" | head -c 8)" > %{_builddir}/%{ui_src_name}/.tarball-version
%endif
# prepare dirs/files necessary for building all bundles # prepare dirs/files necessary for building all bundles
# ----------------------------------------------------- # -----------------------------------------------------
# 1) rubygems sources # 1) rubygems sources
@ -577,6 +592,12 @@ run_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Mon Dec 16 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.8-2
- Rebased pcs to the latest sources (see CHANGELOG.md)
Resolves: RHEL-46303, RHEL-69040
- Rebased pcs-web-ui to the latest sources
Resolves: RHEL-69272, RHEL-69278, RHEL-69279, RHEL-69280, RHEL-69281, RHEL-69282
* Tue Nov 19 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.8-2 * Tue Nov 19 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.8-2
- Rebased to the latest sources (see CHANGELOG.md) - Rebased to the latest sources (see CHANGELOG.md)
Resolves: RHEL-16232, RHEL-46284, RHEL-46286, RHEL-46293, RHEL-55441, RHEL-61738, RHEL-61901 Resolves: RHEL-16232, RHEL-46284, RHEL-46286, RHEL-46293, RHEL-55441, RHEL-61738, RHEL-61901

5
sources
View File

@ -4,7 +4,6 @@ SHA512 (mustermann-3.0.0.gem) = c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82
SHA512 (ethon-0.16.0.gem) = 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905 SHA512 (ethon-0.16.0.gem) = 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905
SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1 SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1
SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f
SHA512 (ffi-1.16.3.gem) = b3d823a03055412a85ae3dbc10c3b50615614f0b66830e144ca47610b1f93f588ff693a95d364b4f686968b79bba91f9f9fa60b932479c6bf9ceb10e15575b98
SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3 SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3
SHA512 (backports-3.25.0.gem) = 47a2ffb83030cb317e85a4f72a1c4a76a90324b8928ac73e1aa3404a22136661e9ce718bfdd937fbe07b9e05a338fcbd717bb505fb1dd91cfee570bbff9e3f72 SHA512 (backports-3.25.0.gem) = 47a2ffb83030cb317e85a4f72a1c4a76a90324b8928ac73e1aa3404a22136661e9ce718bfdd937fbe07b9e05a338fcbd717bb505fb1dd91cfee570bbff9e3f72
SHA512 (base64-0.2.0.gem) = ee5cdc30e73e625c15cb674cdd16a839ad44ffb0a27d1363f94491b48d95da37a2976c34f6f616b722a35750a067eb2245c4746d7d36f8e9a9ecee68ff5540fb SHA512 (base64-0.2.0.gem) = ee5cdc30e73e625c15cb674cdd16a839ad44ffb0a27d1363f94491b48d95da37a2976c34f6f616b722a35750a067eb2245c4746d7d36f8e9a9ecee68ff5540fb
@ -23,6 +22,6 @@ SHA512 (puma-6.4.3.gem) = e8baf137c5164f11b8563561405fc4218210707bfb15d0f21118d4
SHA512 (rack-3.1.8.gem) = 7d7b3d8d40c3afc184de90c7602385854bc890ec13c98029e31db0134dbebd7655425334249c908bdb9e5fd1f15754872064611bbf1317a46c6082fd7cdf9b9d SHA512 (rack-3.1.8.gem) = 7d7b3d8d40c3afc184de90c7602385854bc890ec13c98029e31db0134dbebd7655425334249c908bdb9e5fd1f15754872064611bbf1317a46c6082fd7cdf9b9d
SHA512 (rackup-2.2.1.gem) = e63c4dee6f1a677d507df0ae7bcebec88673e7a0a8d6621997949045db60801907038a148a0608f6e62864cb2ac056fca382f3438dc227b0fa7a3be52d56ea66 SHA512 (rackup-2.2.1.gem) = e63c4dee6f1a677d507df0ae7bcebec88673e7a0a8d6621997949045db60801907038a148a0608f6e62864cb2ac056fca382f3438dc227b0fa7a3be52d56ea66
SHA512 (tilt-2.4.0.gem) = 8cf5036017f501da8843340a9c574ee647074782dcb27ee0aa906fb96ad1e66b90dfb80159aa4c5e7605490058c5ae478bd0fe09f17ae50a2697327d02c814cc SHA512 (tilt-2.4.0.gem) = 8cf5036017f501da8843340a9c574ee647074782dcb27ee0aa906fb96ad1e66b90dfb80159aa4c5e7605490058c5ae478bd0fe09f17ae50a2697327d02c814cc
SHA512 (pcs-web-ui-0.1.21.tar.gz) = 7d619457ba0e104cb96552057fedcb8a80e95be9aedd0e7decf37af7d424c0177ef6a6c0864654d16a60275ab109e29fe9c4b4d84efb620c560bf988e6c5898d
SHA512 (pcs-web-ui-node-modules-0.1.21.tar.xz) = fb69949224b5637cf7e825b3bd9694c98667513f54c044d06911cce7964ccdcc66530d46b9289f24995abaff9dd6ed62a805ab926773c595c150a70a80cc989b SHA512 (pcs-web-ui-node-modules-0.1.21.tar.xz) = fb69949224b5637cf7e825b3bd9694c98667513f54c044d06911cce7964ccdcc66530d46b9289f24995abaff9dd6ed62a805ab926773c595c150a70a80cc989b
SHA512 (pcs-7096a208ff39419c5a733ec68e0fe85cbc1611db.tar.gz) = ec6dcdc294633e833c537d705ab090573c5da14ca2e5331dd0b021896bed3caf9c2cf1de862f27676d735b7d1822869e44f38aaa272c336ac63e4ffaae42a954 SHA512 (pcs-73c3ba7aec1e2abf2ef7c3d0ffddeeef7c7516d0.tar.gz) = a301d39f59bce09fa9bd24b07b886daac8106b76797456c977343142bc771e291d8afad8079d972e6668b091102b2830ae11ded721c3841f994c3cafbe131f48
SHA512 (pcs-web-ui-34372d1268f065ed186546f55216aaa2d7e76b54.tar.gz) = 67f388c020243764ab52e291ff6cdb8e7346f6d184e31919561ca63affc301b0baf8a968e1088161d9b7f9f2cc5c4f1a517aa3e2016b0d0930d1e2ba320c6865