From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 11 Nov 2021 22:58:10 +0000 (+0100)
Subject: - poldek as such does not need bdb when built for rpm.org
X-Git-Tag: auto/th/poldek-0.42.2-8.2021~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d37cdfea68f9fb65e2fbcdf2521e19e30aa60d76;p=packages%2Fpoldek.git

- poldek as such does not need bdb when built for rpm.org
---

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 b33c502..d6b06a6 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -69,6 +69,7 @@ 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
@@ -263,6 +264,7 @@ cd ..
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4