packages/rpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!412 fix RPM_LD_FLAGS not got exported

Browse Source 
From: @fundawang 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99
This commit is contained in:
openeuler-ci-bot 2024-10-28 03:04:11 +00:00 committed by Gitee
commit 6bb3ab2baf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unbundle-config-site-and-add-RPM-LD-FLAGS-macro.patch
View File

@ -20,7 +20,7 @@ index a2411d7..8cb8a5a 100644
RPM_OS=\"%{_os}\"\ RPM_OS=\"%{_os}\"\
RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\ RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\ - export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_OPT_FLAGS\ + export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
RPM_DOC_DIR=\"%{_docdir}\"\ RPM_DOC_DIR=\"%{_docdir}\"\
export RPM_DOC_DIR\ export RPM_DOC_DIR\
RPM_PACKAGE_NAME=\"%{NAME}\"\ RPM_PACKAGE_NAME=\"%{NAME}\"\

7
rpm.spec
View File

@ -1,6 +1,6 @@
Name: rpm Name: rpm
Version: 4.18.2 Version: 4.18.2
Release: 18 Release: 19
Summary: RPM Package Manager Summary: RPM Package Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://rpm.org/ URL: https://rpm.org/
@ -336,6 +336,9 @@ make clean
%exclude %{_mandir}/man8/rpmspec.8* %exclude %{_mandir}/man8/rpmspec.8*
%changelog %changelog
* Sat Oct 26 2024 Funda Wang <fundawang@yeah.net> - 4.18.2-19
- fix RPM_LD_FLAGS not got exported
* Fri Oct 25 2024 hugel<xuce10@h-partners.com> - 4.18.2-18 * Fri Oct 25 2024 hugel<xuce10@h-partners.com> - 4.18.2-18
- Separate the SELinux patch from the IMA digest list patch - Separate the SELinux patch from the IMA digest list patch
@ -418,7 +421,7 @@ make clean
* Tue Jun 20 2023 renhongxun<renhongxun@h-partners.com> - 4.18.1-1 * Tue Jun 20 2023 renhongxun<renhongxun@h-partners.com> - 4.18.1-1
- upgrade version to 4.18.1 - upgrade version to 4.18.1
* Wed Jun 21 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-11 * Tue Jun 20 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-11
- Fix per-file plugin hook regression introduced in 4.18 - Fix per-file plugin hook regression introduced in 4.18
* Mon Jun 19 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-10 * Mon Jun 19 2023 renhongxun<renhongxun@h-partners.com> - 4.18.0-10