X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=5fbd409614edd2f5af64d698698c3ff2ffde688d;hb=fd8e5bba0a5bd9fa73a5a683d2c02b1a37e25d67;hp=069e8d32592ade1078f377d9546091da36f33d7e;hpb=429db28995bcacc92739440946243eb44d8e8bb4;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index 069e8d3..5fbd409 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -11,21 +11,18 @@
 %bcond_with	tests	# tests
 
 # current snapshot name
-%define		SNAP	2020
+%define		SNAP	2021
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%if %{without rpm5}
-%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)
-%else
+%if %{with rpm5}
 %define		ver_db		%(rpm -q --provides rpm-lib | awk 'BEGIN { v="RPM_TOO_OLD" } /^rpm-db-ver = [.0-9]+$/ { v=$3 } END { print v }')
 %define		db_pkg		db%{ver_db}
 %define		ver_rpm		5.4.10
+%else
+%define		ver_rpm		1:4.14
 %endif
 
-%define		rel	7
+%define		rel	8
 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
@@ -68,8 +65,10 @@ Patch13:	trurlib-shared.patch
 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}
+%{?with_rpm5:BuildRequires:	%{db_pkg}-devel >= %{ver_db}}
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
@@ -100,7 +99,7 @@ BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
 %if %{with static}
-BuildRequires:	%{db_pkg}-static >= %{ver_db}
+%{?with_rpm5:BuildRequires:	%{db_pkg}-static >= %{ver_db}}
 BuildRequires:	bzip2-static
 BuildRequires:	glibc-static
 BuildRequires:	libxml2-static
@@ -115,9 +114,7 @@ BuildRequires:	zstd-static
 %endif
 Requires(postun):	awk
 Requires(postun):	sed >= 4.0
-%if %{without rpm5}
-Requires:	%{db_pkg} >= %{ver_db_devel}
-%else
+%if %{with rpm5}
 Requires:	%{db_pkg} >= %{ver_db}
 Requires:	rpm-db-ver = %{ver_db}
 %endif
@@ -261,6 +258,8 @@ cd ..
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4