rpms
/
rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use external find-debug and debugedit 

Delete tools and point macro to the external ones (instead of using
symlinks)

Resolves: #2166383
This commit is contained in:
Florian Festi 2023-05-04 14:21:10 +02:00
parent 1ff4308fe4
commit 9bfd8d7033
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpm.spec
View File

@ -32,7 +32,7 @@
%global rpmver 4.16.1.3 %global rpmver 4.16.1.3
#global snapver rc1 #global snapver rc1
%global rel 23 %global rel 24
%global sover 9 %global sover 9
%global srcver %{rpmver}%{?snapver:-%{snapver}} %global srcver %{rpmver}%{?snapver:-%{snapver}}
@ -356,6 +356,9 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
%prep %prep
%autosetup -n rpm-%{srcver} %{?with_int_bdb:-a 1} -p1 %autosetup -n rpm-%{srcver} %{?with_int_bdb:-a 1} -p1
# Use external find-debuginfo
sed -i -e "s:%%{_rpmconfigdir}/find-debuginfo.sh:%%{_bindir}/find-debuginfo.sh:g" macros.in
%if %{with bdb} && %{with int_bdb} %if %{with bdb} && %{with int_bdb}
ln -s db-%{bdbver} db ln -s db-%{bdbver} db
%endif %endif
@ -418,11 +421,8 @@ pushd python
%py3_install %py3_install
popd popd
# replace in-tree debugedit with upstream one # remove in-tree debugedit as we now use the debugedit package
rm $RPM_BUILD_ROOT/%{rpmhome}/debugedit rm -f $RPM_BUILD_ROOT/%{rpmhome}/{debugedit,sepdebugcrcfix,find-debuginfo.sh}
rm $RPM_BUILD_ROOT/%{rpmhome}/find-debuginfo.sh
ln -s ../../bin/debugedit $RPM_BUILD_ROOT/%{rpmhome}/debugedit
ln -s ../../bin/find-debuginfo $RPM_BUILD_ROOT/%{rpmhome}/find-debuginfo.sh
mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir} install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}
@ -599,9 +599,6 @@ fi
%{rpmhome}/brp-* %{rpmhome}/brp-*
%{rpmhome}/check-* %{rpmhome}/check-*
%{rpmhome}/debugedit
%{rpmhome}/sepdebugcrcfix
%{rpmhome}/find-debuginfo.sh
%{rpmhome}/find-lang.sh %{rpmhome}/find-lang.sh
%{rpmhome}/*provides* %{rpmhome}/*provides*
%{rpmhome}/*requires* %{rpmhome}/*requires*
@ -636,10 +633,12 @@ fi
%changelog %changelog
* Thu May 04 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-24
- Use external find-debug and debugedit (#2166383)
* Wed May 03 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-23 * Wed May 03 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-23
- Don't error out on IMA signatures on files not supporting them - Don't error out on IMA signatures on files not supporting them
(#2157835, #2157836) (#2157835, #2157836)
- Use external find-debug and debugedit (#2166383)
* Mon Dec 19 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-22 * Mon Dec 19 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-22
- Fix option handling in rpm2archive for #2150804 - Fix option handling in rpm2archive for #2150804