- merged changes from PLD

diff --git a/linguas.patch b/linguas.patch
new file mode 100644 (file)
index 0000000..97d86cf
--- /dev/null
+++ b/linguas.patch
@@ -0,0 +1,35 @@
+From 9a91c58a282617a536a99d86be4eaa2da7e433ed Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Thu, 26 Jun 2025 00:30:42 +0200
+Subject: [PATCH] list available translations in po/LINGUAS file
+
+fixes compatibility with gettext >= 0.24
+---
+ configure.ac | 2 --
+ po/LINGUAS   | 1 +
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 po/LINGUAS
+
+diff --git a/configure.ac b/configure.ac
+index fab947b..9afc747 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,8 +46,6 @@ fi
+ AC_SUBST(VERSION_CVSTAG)
+ AC_DEFINE_UNQUOTED([VERSION_YEAR], "$VERSION_YEAR", [version year])
+ 
+-ALL_LINGUAS="pl de"
+-
+ dnl cond. building NFY
+ dnl AC_DEFINE([ENABLE_VFILE_TRURLIO],1,[defined if trurlio is used for vfile operations])
+ 
+diff --git a/po/LINGUAS b/po/LINGUAS
+new file mode 100644
+index 0000000..78b66c3
+--- /dev/null
++++ b/po/LINGUAS
+@@ -0,0 +1 @@
++de pl
+-- 
+2.50.0
+

diff --git a/pkgiter-preun-req-skip.patch b/pkgiter-preun-req-skip.patch
new file mode 100644 (file)
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@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
+

diff --git a/poldek.spec b/poldek.spec
index 8cf09f997aab863a655a18e0c7d934e523dc3da6..950009121216ecdf09334409c8138b9ad3cb0583 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -11,7 +11,7 @@
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define                ver_rpm         1:4.14
 
-%define                rel     8
+%define                rel     12
 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
@@ -38,6 +38,8 @@ Patch3:               fix-reinstall-sigsev.patch
 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/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -211,6 +213,8 @@ Moduły języka Python dla poldka.
 %patch -P 4 -p1
 %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