[packages/poldek] fix R(*trans,pre,post) deps not being installed if they are R(*un) too; rel 9
atler
atler at pld-linux.org
Thu Jun 26 00:49:41 CEST 2025
commit 0d5c1aefc187d34a4656fa6c56dc57b95aa437d6
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jun 26 00:45:24 2025 +0200
fix R(*trans,pre,post) deps not being installed if they are R(*un) too; rel 9
pkgiter-preun-req-skip.patch | 25 +++++++++++++++++++++++++
poldek.spec | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index 2aad2ed..dd63195 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -22,7 +22,7 @@
%define ver_rpm 1:4.14
%endif
-%define rel 8
+%define rel 9
Summary: RPM packages management helper tool
Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -56,6 +56,7 @@ Patch4: restore-verify-all.patch
Patch5: proxy-fix.patch
Patch6: verify-fix.patch
Patch7: linguas.patch
+Patch8: pkgiter-preun-req-skip.patch
URL: http://poldek.pld-linux.org/
%{?with_rpm5:BuildRequires: %{db_pkg}-devel >= %{ver_db}}
BuildRequires: autoconf >= 2.63
@@ -236,6 +237,7 @@ Moduły języka Python dla poldka.
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
+%patch -P 8 -p1
%{__rm} doc/poldek.info
%{__rm} m4/libtool.m4 m4/lt*.m4
diff --git a/pkgiter-preun-req-skip.patch b/pkgiter-preun-req-skip.patch
new file mode 100644
index 0000000..900c616
--- /dev/null
+++ b/pkgiter-preun-req-skip.patch
@@ -0,0 +1,25 @@
+From cfb03a18a51ed409a143ef56624fc67b12b58073 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Wed, 25 Jun 2025 22:11:12 +0200
+Subject: [PATCH] pkgiter: don't skip reqs which are both pre and preun
+
+---
+ pkgiter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkgiter.c b/pkgiter.c
+index bc085a4..4e0b810 100644
+--- a/pkgiter.c
++++ b/pkgiter.c
+@@ -147,7 +147,7 @@ const struct capreq *pkg_req_iter_get(struct pkg_req_iter *it)
+ if ((it->flags & PKG_ITER_REQUN) && !capreq_is_prereq_un(req))
+ return pkg_req_iter_get(it);
+
+- else if ((it->flags & PKG_ITER_REQUN) == 0 && capreq_is_prereq_un(req))
++ else if ((it->flags & PKG_ITER_REQUN) == 0 && !capreq_is_prereq(req) && capreq_is_prereq_un(req))
+ return pkg_req_iter_get(it);
+
+ /* set type of returned (current) req */
+--
+2.50.0
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/0d5c1aefc187d34a4656fa6c56dc57b95aa437d6
More information about the pld-cvs-commit
mailing list