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

diff --git a/poldek.spec b/poldek.spec
index 9e0ab23..5fbd409 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -7,25 +7,22 @@
 %bcond_without	imode	# don't build interactive mode
 %bcond_with	python	# don't build python bindings
 %bcond_with	snap	# install configs for official Th snapshot
-%bcond_with	rpm4	# use rpm4 instead of rpm5
+%bcond_with	rpm5	# use rpm5 instead of rpm4
 %bcond_with	tests	# tests
 
 # current snapshot name
-%define		SNAP	2019
+%define		SNAP	2021
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%if %{with rpm4}
-%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	3
+%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
@@ -65,8 +62,13 @@ Patch10:	rpm4-cpuinfo-deps.patch
 Patch11:	rpm4-no-dir-deps.patch
 Patch12:	rpm4-rpmvercmp.patch
 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
@@ -77,6 +79,7 @@ BuildRequires:	gettext-tools >= 0.11.5
 BuildRequires:	libgomp-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2
+BuildRequires:	lua54-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
@@ -96,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
@@ -111,9 +114,7 @@ BuildRequires:	zstd-static
 %endif
 Requires(postun):	awk
 Requires(postun):	sed >= 4.0
-%if %{with rpm4}
-Requires:	%{db_pkg} >= %{ver_db_devel}
-%else
+%if %{with rpm5}
 Requires:	%{db_pkg} >= %{ver_db}
 Requires:	rpm-db-ver = %{ver_db}
 %endif
@@ -254,6 +255,11 @@ Moduły języka Python dla poldka.
 cd trurlib
 %patch13 -p1
 cd ..
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
@@ -318,7 +324,7 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poldek-config
 
 %{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
-%ifarch i486 i686 ppc sparc alpha athlon aarch64
+%ifarch i486 i686 ppc sparc alpha athlon aarch64 %{arm}
 	%define		ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}