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

Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2

Browse Source 
Workaround for dnf dependency resolution confusion between nodejs16 vs nodejs
Workaround for find-debuginfo.sh failure wrt ruby3.2 gem install change
This commit is contained in:
Mamoru TASAKA 2023-01-04 15:01:32 +09:00
parent dc07da9166
commit 7315593416
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.11.4 Version: 0.11.4
Release: 1%{?dist} Release: 2%{?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
@ -108,6 +108,9 @@ BuildRequires: diffstat
BuildRequires: systemd BuildRequires: systemd
# for building web ui # for building web ui
# Explicitly require binary path to workaround dnf dependency resolution
# confusion between nodejs16 <-> nodejs
BuildRequires: %{_bindir}/npx
BuildRequires: npm BuildRequires: npm
# cluster stack packages for pkg-config # cluster stack packages for pkg-config
@ -306,7 +309,11 @@ cp %{pcs_bundled_dir}/src/dacite-*/README.md dacite_README.md
# rpmdiff's binary stripping checker. # rpmdiff's binary stripping checker.
# Therefore we call find-debuginfo.sh script manually in order to strip # Therefore we call find-debuginfo.sh script manually in order to strip
# binaries and add MiniDebugInfo with .gnu_debugdata section # binaries and add MiniDebugInfo with .gnu_debugdata section
/usr/lib/rpm/find-debuginfo.sh -j2 -m -i -S debugsourcefiles.list
# With ruby3.2 (F38), gem install cleans up ext directory after installation.
# With this change, now only one thin_parser.so is installed and it seems
# the below find-debuginfo.sh exists with 127, ignore the failure
bash -x /usr/lib/rpm/find-debuginfo.sh -j2 -m -i -S debugsourcefiles.list || :
# find-debuginfo.sh generated some files into /usr/lib/debug and # find-debuginfo.sh generated some files into /usr/lib/debug and
# /usr/src/debug/ that we don't want in the package # /usr/src/debug/ that we don't want in the package
rm -rf $RPM_BUILD_ROOT%{_libdir}/debug rm -rf $RPM_BUILD_ROOT%{_libdir}/debug
@ -428,6 +435,11 @@ run_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.11.4-2
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
- Workaround for dnf dependency resolution confusion between nodejs16 vs nodejs
- Workaround for find-debuginfo.sh failure wrt ruby3.2 gem install change
* Mon Dec 12 2022 Michal Pospisil <mpospisi@redhat.com> - 0.11.4-1 * Mon Dec 12 2022 Michal Pospisil <mpospisi@redhat.com> - 0.11.4-1
- Rebased to latest upstream sources (see CHANGELOG.md) - Rebased to latest upstream sources (see CHANGELOG.md)
- Updated pcs-web-ui - Updated pcs-web-ui