| |
@@ -1,5 +1,5 @@
|
| |
Name: pcs
|
| |
- Version: 0.10.11
|
| |
+ Version: 0.10.13
|
| |
Release: 1%{?dist}
|
| |
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
|
| |
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
| |
@@ -17,8 +17,8 @@
|
| |
%global pcs_source_name %{name}-%{version_or_commit}
|
| |
|
| |
# ui_commit can be determined by hash, tag or branch
|
| |
- %global ui_commit 0.1.9
|
| |
- %global ui_modules_version 0.1.9
|
| |
+ %global ui_commit 0.1.12
|
| |
+ %global ui_modules_version 0.1.12
|
| |
%global ui_src_name pcs-web-ui-%{ui_commit}
|
| |
|
| |
%global pcs_snmp_pkg_name pcs-snmp
|
| |
@@ -51,8 +51,14 @@
|
| |
Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_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
|
| |
|
| |
+ # pcs patches: <= 200
|
| |
# Patch0: name.patch
|
| |
|
| |
+ # ui patches: >200
|
| |
+ # Patch201: name.patch
|
| |
+ Patch201: simplify-ternar-expression.patch
|
| |
+ Patch202: fix-backend-parameter-all-in-cluster-destroy.patch
|
| |
+
|
| |
# git for patches
|
| |
BuildRequires: git-core
|
| |
BuildRequires: make
|
| |
@@ -211,8 +217,6 @@
|
| |
SNMP agent that provides information about pacemaker cluster to the master agent (snmpd)
|
| |
|
| |
%prep
|
| |
- %autosetup -p1 -S git -n %{pcs_source_name}
|
| |
-
|
| |
# -- following is inspired by python-simplejon.el5 --
|
| |
# Update timestamps on the files touched by a patch, to avoid non-equal
|
| |
# .pyc/.pyo files across the multilib peers within a build
|
| |
@@ -252,13 +256,21 @@
|
| |
update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}`
|
| |
}
|
| |
|
| |
+ # documentation for setup/autosetup/autopatch:
|
| |
+ # * http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html
|
| |
+ # * https://rpm-software-management.github.io/rpm/manual/autosetup.html
|
| |
+ # patch web-ui sources
|
| |
+ %autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N
|
| |
+ %autopatch -p1 -m 201
|
| |
+ # update_times_patch %%{PATCH201}
|
| |
+ update_times_patch %{PATCH201}
|
| |
+ update_times_patch %{PATCH202}
|
| |
+
|
| |
+ # patch pcs sources
|
| |
+ %autosetup -S git -n %{pcs_source_name} -N
|
| |
+ %autopatch -p1 -M 200
|
| |
# update_times_patch %{PATCH0}
|
| |
|
| |
- # prepare dirs/files necessary for building web ui
|
| |
- # inside SOURCE100 is only directory %%{ui_src_name}
|
| |
- tar -xzf %SOURCE100 -C %{pcsd_public_dir}
|
| |
- tar -xf %SOURCE101 -C %{pcsd_public_dir}/%{ui_src_name}
|
| |
-
|
| |
# prepare dirs/files necessary for building all bundles
|
| |
# -----------------------------------------------------
|
| |
# 1) rubygems sources
|
| |
@@ -275,19 +287,20 @@
|
| |
%define debug_package %{nil}
|
| |
|
| |
./autogen.sh
|
| |
- %{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3}
|
| |
+ %{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} ruby_CFLAGS="%{optflags}" ruby_LIBS="%{build_ldflags}"
|
| |
make all
|
| |
|
| |
+ # build pcs-web-ui
|
| |
+ make -C %{_builddir}/%{ui_src_name} build BUILD_USE_EXISTING_NODE_MODULES=true
|
| |
+
|
| |
%install
|
| |
rm -rf $RPM_BUILD_ROOT
|
| |
pwd
|
| |
|
| |
%make_install
|
| |
|
| |
- # build web ui and put it to pcsd
|
| |
- make -C %{pcsd_public_dir}/%{ui_src_name} build BUILD_USE_EXISTING_NODE_MODULES=true
|
| |
- mv %{pcsd_public_dir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui
|
| |
- rm -r %{pcsd_public_dir}/%{ui_src_name}
|
| |
+ # install pcs-web-ui
|
| |
+ cp -r %{_builddir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui
|
| |
|
| |
# symlink favicon into pcsd directories
|
| |
ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/favicon.png
|
| |
@@ -434,6 +447,10 @@
|
| |
%license pyagentx_LICENSE.txt
|
| |
|
| |
%changelog
|
| |
+ * Tue Feb 01 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.13-1
|
| |
+ - Rebased to latest upstream sources (see CHANGELOG.md)
|
| |
+ - Updated pcs-web-ui
|
| |
+
|
| |
* Tue Oct 05 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.11-1
|
| |
- Rebased to latest upstream sources (see CHANGELOG.md)
|
| |
- Updated pcs-web-ui
|
| |