[packages/dnf5] - port PLD specific patches from dnf 4

[baggins]

commit 8ad5ae3dd9b06dd0e444ad8660f1d15468be6fa0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 16 01:34:35 2025 +0100

    - port PLD specific patches from dnf 4

 dnf5.spec                | 10 ++++++++--
 repos.d.patch            |  7 +++++++
 uname-cpuinfo-deps.patch | 13 +++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/dnf5.spec b/dnf5.spec
index 3637b7c..7d70f71 100644
--- a/dnf5.spec
+++ b/dnf5.spec
@@ -37,8 +37,10 @@ Release:	1
 License:	GPL v2+
 Source0:	https://github.com/rpm-software-management/dnf5/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	118b176708e1c463ce56f371725c8905
-Patch0:		systemdunitdir.patch
-Patch1:		perl-long-long.patch
+Patch0:		repos.d.patch
+Patch1:		uname-cpuinfo-deps.patch
+Patch2:		systemdunitdir.patch
+Patch3:		perl-long-long.patch
 # sdbus-cpp 2.x
 Patch100:	0001-cmake-Move-sdbus-c-check-to-one-place.patch
 Patch101:	0002-dnfdaemon-sdbus-cpp-v.-2-requires-strong-types.patch
@@ -324,6 +326,8 @@ similar.
 %setup -q
 %patch -P 0 -p1
 %patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
 %patch -P 100 -p1
 %patch -P 101 -p1
 %patch -P 102 -p1
@@ -375,6 +379,7 @@ TMPDIR=/tmp /usr/bin/ctest --force-new-ctest-process --output-on-failure
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{cache/libdnf5,lib/dnf}
 install -d $RPM_BUILD_ROOT%{_prefix}/lib/sysimage/libdnf5/{comps_groups,offline}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/dnf/repos.d
 
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -452,6 +457,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/dnf/dnf5-aliases.d
 %doc %{_sysconfdir}/dnf/dnf5-aliases.d/README
 %dir %{_sysconfdir}/dnf/dnf5-plugins
+%dir %{_sysconfdir}/dnf/repos.d
 %dir %{_libdir}/dnf5
 %dir %{_libdir}/dnf5/plugins
 %doc %{_libdir}/dnf5/plugins/README
diff --git a/repos.d.patch b/repos.d.patch
new file mode 100644
index 0000000..88b402a
--- /dev/null
+++ b/repos.d.patch
@@ -0,0 +1,7 @@
+--- dnf5-5.2.10.0/dnf5/config/etc/dnf/dnf.conf~	2025-02-06 09:25:15.000000000 +0100
++++ dnf5-5.2.10.0/dnf5/config/etc/dnf/dnf.conf	2025-02-16 01:08:07.203325688 +0100
+@@ -1,3 +1,4 @@
+ # see `man dnf.conf` for defaults and possible options
+ 
+ [main]
++reposdir=/etc/dnf/repos.d
diff --git a/uname-cpuinfo-deps.patch b/uname-cpuinfo-deps.patch
new file mode 100644
index 0000000..b7293aa
--- /dev/null
+++ b/uname-cpuinfo-deps.patch
@@ -0,0 +1,13 @@
+--- dnf5-5.2.10.0/dnf5-plugins/builddep_plugin/builddep.cpp~	2025-02-06 09:25:15.000000000 +0100
++++ dnf5-5.2.10.0/dnf5-plugins/builddep_plugin/builddep.cpp	2025-02-16 01:01:46.183325778 +0100
+@@ -249,7 +249,9 @@
+         auto dependency_set = rpmdsInit(rpmdsNewPool(nullptr, header, RPMTAG_REQUIRENAME, 0));
+         while (rpmdsNext(dependency_set) >= 0) {
+             std::string_view reldep = rpmdsDNEVR(dependency_set) + 2;
+-            if (!reldep.starts_with("rpmlib(")) {
++            if (!(reldep.starts_with("rpmlib(") ||
++                  reldep.starts_with("uname(") ||
++                  reldep.starts_with("cpuinfo("))) {
+                 install_specs.emplace(reldep);
+             }
+         }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dnf5.git/commitdiff/8ad5ae3dd9b06dd0e444ad8660f1d15468be6fa0