From 4681641f45fcd4d3a57510e44ecb002ec390ae22 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 20 Feb 2022 14:25:02 +0100
Subject: [PATCH] - merged PLD changes

---
 no-bdb-for-rpm-org.patch | 23 +++++++++++++++++++++++
 poldek.spec              | 10 +++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 no-bdb-for-rpm-org.patch

diff --git a/no-bdb-for-rpm-org.patch b/no-bdb-for-rpm-org.patch
new file mode 100644
index 0000000..992566d
--- /dev/null
+++ b/no-bdb-for-rpm-org.patch
@@ -0,0 +1,23 @@
+--- poldek-0.42.2/configure.ac~	2021-11-11 23:41:40.000000000 +0100
++++ poldek-0.42.2/configure.ac	2021-11-11 23:52:39.152953112 +0100
+@@ -327,7 +327,7 @@
+ 	#fi
+ else
+     if test "${is_rpmorg}." = "yes."; then
+-	AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS])
++	: ;
+     else
+         AC_CHECK_LIB(db4, db_create, [DBLIB="-ldb4" DBINCLUDE="-I/usr/include/db4"],
+             [AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1" DBINCLUDE="-I/usr/include/db4.1"],
+@@ -372,9 +372,11 @@
+                             AC_DEFINE([HAVE_RPM_4_2],1,[])])
+ AC_CHECK_FUNCS(hGetColor, AC_DEFINE([HAVE_RPM_HGETCOLOR],1,[]))
+ 
++if test "${is_rpmorg}." != "yes."; then
+ AC_CHECK_HEADERS([db_185.h],,[
+ 	AC_MSG_WARN(["disabled synchronization with db file-dependencies"]) ])
+ AC_CHECK_FUNCS(__db185_open)
++fi
+ 
+ dnl 4.0.4 has cross dependenecies(?)
+ if test "${is_rpm4_0_4}." = "yes." -a "${ENABLE_STATIC}." = "yes." ; then
diff --git a/poldek.spec b/poldek.spec
index ee551c3..92e28bd 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -9,17 +9,14 @@
 %bcond_with	tests	# tests
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define		db_pkg		db
-%define		ver_db		5.3
 %define		ver_rpm		1:4.14
-%define		ver_db_devel	%(rpm -q --qf '%|E?{%{E}:}|%{V}-%{R}' --what-provides db-devel)
 
 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
 Name:		poldek
 Version:	0.42.2
-Release:	7
+Release:	9
 License:	GPL v2
 Group:		Applications/System
 #Source0:	http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
@@ -51,8 +48,8 @@ Patch14:	rpm4-script-req-workaround.patch
 Patch15:	skip-buildid-obsoletes.patch
 Patch16:	verify-signature.patch
 Patch17:	%{name}-rsa_sig_rpmorg.patch
+Patch18:	no-bdb-for-rpm-org.patch
 URL:		http://poldek.pld-linux.org/
-BuildRequires:	%{db_pkg}-devel >= %{ver_db}
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
@@ -83,7 +80,6 @@ BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
 %if %{with static}
-BuildRequires:	%{db_pkg}-static >= %{ver_db}
 BuildRequires:	bzip2-static
 BuildRequires:	glibc-static
 BuildRequires:	libxml2-static
@@ -98,7 +94,6 @@ BuildRequires:	zstd-static
 %endif
 Requires(postun):	awk
 Requires(postun):	sed >= 4.0
-Requires:	%{db_pkg} >= %{ver_db_devel}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/bin/run-parts
 Requires:	rpm >= %{ver_rpm}
@@ -240,6 +235,7 @@ cd ..
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
-- 
2.44.0