From 139bc590fbd84f5e2019dad7eb113e684ad62d90 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 3 May 2021 17:22:14 +0200 Subject: [PATCH] Enable RPATH check after %install Part of https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild Resolves: rhbz#1964548 --- macros | 2 ++ redhat-rpm-config.spec | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/macros b/macros index 802d00d..db5151b 100644 --- a/macros +++ b/macros @@ -246,6 +246,7 @@ print(result) %__brp_strip_static_archive /usr/lib/rpm/brp-strip-static-archive %{__strip} %__brp_python_bytecompile /usr/lib/rpm/redhat/brp-python-bytecompile "" "%{?_python_bytecompile_errors_terminate_build}" "%{?_python_bytecompile_extra}" %__brp_fix_pyc_reproducibility /usr/lib/rpm/redhat/brp-fix-pyc-reproducibility +%__brp_check_rpaths /usr/lib/rpm/check-rpaths %__brp_python_hardlink /usr/lib/rpm/brp-python-hardlink # __brp_mangle_shebangs_exclude - shebangs to exclude # __brp_mangle_shebangs_exclude_file - file from which to get shebangs to exclude @@ -267,6 +268,7 @@ print(result) %{?__brp_strip_static_archive} \ %{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \ %{?py_reproducible_pyc_path:%{?__brp_fix_pyc_reproducibility} "%{py_reproducible_pyc_path}"} \ + %{?__brp_check_rpaths} \ %{?__brp_python_hardlink} \ %{?__brp_mangle_shebangs} \ %{nil} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index d751e11..5a69a1b 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 185 +Version: 186 Release: 1%{?dist} # No version specified. License: GPL+ @@ -220,6 +220,11 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon May 31 2021 Charalampos Stratakis - 186-1 +- Enable RPATH check after %%install +- Part of https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild +- Resolves: rhbz#1964548 + * Wed May 26 2021 Arjun Shankar - 185-1 - Disable annobin on armv7hl