X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=c7bef13af7a728bb7b48c7aac45f3f5f74596700;hp=c74511a2b7b3f32deefe2d5a84b89c722dde6d4e;hb=2aa7d974ad81aa11e64f99d8a0b8af5d8176b044;hpb=ae22840568bed8891cb46c685384e5823323d631

diff --git a/rpm.spec b/rpm.spec
index c74511a..c7bef13 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,12 +11,11 @@
 
 %define		db_ver		5.3.28.0
 %define		popt_ver	1.15
-%define		openssl_ver	1.1.1d
 %define		sover		9.1.0
 
- %if %{_ver_ge '%{_rpmversion}' '4.12'} && %{_ver_lt '%{_rpmversion}' '5.0'}
- %define	with_recommends_tags
- %endif
+%if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
+%define	with_recommends_tags	1
+%endif
 
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
@@ -27,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.1
+Release:	0.7
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -73,7 +72,13 @@ Patch17:	python-internal-build.patch
 Patch18:	rpmversion.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
+Patch21:	aarch64.patch
+Patch22:	ix86-platforms.patch
+Patch23:	shortcircuited-deps.patch
+Patch24:	cpuinfo-deps.patch
+Patch25:	rpmio-read-proc-files.patch
 URL:		https://rpm.org/
+BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1.4
@@ -81,8 +86,9 @@ BuildRequires:	bzip2-devel >= 1.0.2-17
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	gettext-tools >= 0.19.2
 BuildRequires:	libarchive-devel
+BuildRequires:	libcap-devel
 BuildRequires:	libmagic-devel
-BuildRequires:	openssl-devel >= %{openssl_ver}
+BuildRequires:	libgcrypt-devel
 %if %{with plugins}
 BuildRequires:	audit-libs-devel
 BuildRequires:	dbus-devel
@@ -100,6 +106,7 @@ BuildRequires:	python3-modules
 %if %{with python3}
 BuildRequires:	python3-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.750
 %endif
 BuildRequires:	sqlite3-devel >= 3.22.0
 BuildRequires:	tcl
@@ -117,7 +124,7 @@ Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 Requires:	rpm-pld-macros >= 1.744
 Requires:	FHS >= 3.0-2
-Requires:	openssl >= %{openssl_ver}
+Requires:	libgcrypt
 Requires:	popt >= %{popt_ver}
 %if %{with recommends_tags}
 Recommends:	rpm-plugin-audit
@@ -221,7 +228,6 @@ Summary(pl.UTF-8):	Biblioteki RPM-a
 Group:		Libraries
 Requires:	db >= %{db_ver}
 Requires:	libmagic >= 1.15-2
-Requires:	openssl >= %{openssl_ver}
 Requires:	popt >= %{popt_ver}
 Obsoletes:	rpm-libs
 # avoid SEGV caused by mixed db versions
@@ -247,7 +253,7 @@ Requires:	bzip2-devel
 Requires:	db-devel >= %{db_ver}
 Requires:	elfutils-devel
 Requires:	libmagic-devel
-Requires:	openssl-devel >= %{openssl_ver}
+Requires:	libgcrypt-devel
 %if %{with selinux}
 Requires:	libselinux-devel
 Requires:	libsemanage-devel
@@ -557,6 +563,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
@@ -595,10 +606,10 @@ sed -i \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-bdb \
+	--enable-bdb-ro \
 	--enable-ndb \
 	--enable-sqlite \
 	--enable-zstd \
-	--with-crypto=openssl \
 	--with-lua \
 	%{?with_imaevm:--with-imaevm} \
 	--with-cap \
@@ -668,7 +679,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros
 %endif
 
+%ifnarch aarch64
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/aarch64-linux/macros
+%endif
+
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/arm*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros
@@ -678,6 +692,14 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/s390*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sh*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sparc*-linux/macros
 
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%ifarch x32
+%{_target_cpu}-%{_target_vendor}-linux-gnux32
+%else
+%{_target_cpu}-%{_target_vendor}-linux
+%endif
+EOF
+
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/pld
@@ -774,6 +796,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros.lang
+# this is ok to be replaced
+%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform
 
 %{_mandir}/man8/rpm.8*
 %{_mandir}/man8/rpmdb.8*
@@ -814,6 +838,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch alpha
 %{_rpmlibdir}/platform/alpha*
 %endif
+%ifarch aarch64
+%{_rpmlibdir}/platform/aarch64*
+%endif
 %ifarch ia64
 %{_rpmlibdir}/platform/ia64*
 %endif