[packages/poldek] - fix rpmorg detection with rpm 6.0

baggins baggins at pld-linux.org
Wed Oct 1 00:14:12 CEST 2025


commit 502f8639c09202e47acfa75f73129febc19359d9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Oct 1 02:13:42 2025 +0200

    - fix rpmorg detection with rpm 6.0

 poldek.spec |  2 ++
 rpm6.patch  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
---
diff --git a/poldek.spec b/poldek.spec
index 8deb9a5..64b005f 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -57,6 +57,7 @@ Patch5:		proxy-fix.patch
 Patch6:		verify-fix.patch
 Patch7:		linguas.patch
 Patch8:		pkgiter-preun-req-skip.patch
+Patch9:		rpm6.patch
 URL:		http://poldek.pld-linux.org/
 %{?with_rpm5:BuildRequires:	%{db_pkg}-devel >= %{ver_db}}
 BuildRequires:	autoconf >= 2.63
@@ -238,6 +239,7 @@ Moduły języka Python dla poldka.
 %patch -P 6 -p1
 %patch -P 7 -p1
 %patch -P 8 -p1
+%patch -P 9 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
diff --git a/rpm6.patch b/rpm6.patch
new file mode 100644
index 0000000..849ad19
--- /dev/null
+++ b/rpm6.patch
@@ -0,0 +1,19 @@
+--- poldek-0.44.0/configure.ac~	2025-10-01 02:10:00.000000000 +0200
++++ poldek-0.44.0/configure.ac	2025-10-01 02:11:00.383330658 +0200
+@@ -273,6 +273,7 @@
+ 
+ AC_MSG_CHECKING([for rpmorg (>= 4.14)])
+ PKG_CHECK_EXISTS([rpm >= 4.14 rpm < 5.0], [is_rpmorg=yes], [is_rpmorg=no])
++PKG_CHECK_EXISTS([rpm >= 6.0], [is_rpmorg=yes], [is_rpmorg=no])
+ if test "${is_rpmorg}." = "yes."; then
+     AC_MSG_RESULT(yes)
+     AM_CONDITIONAL(WITH_RPMORG, true)
+@@ -287,7 +287,7 @@
+ fi
+ 
+ AC_MSG_CHECKING([for rpm5])
+-PKG_CHECK_EXISTS([rpm >= 5.0], [is_rpm5=yes], [is_rpm5=no])
++PKG_CHECK_EXISTS([rpm >= 5.0 rpm < 6.0], [is_rpm5=yes], [is_rpm5=no])
+ 
+ if test "${is_rpm5}." = "yes."; then
+     AC_DEFINE([HAVE_RPM_5], [1], [])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/502f8639c09202e47acfa75f73129febc19359d9



More information about the pld-cvs-commit mailing list