X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=3f3cf5f114c9e74290823e52f178b3fd28aa890b;hp=35e2370ce9882ccd1dde8eb1d4d818458429aaa3;hb=ca5bc75f9b83c304a364d7aab3d12bc2954a6a5a;hpb=5570f8e668058ff05a43ed59043d0b1aa9ce88df

diff --git a/rpm.spec b/rpm.spec
index 35e2370..3f3cf5f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - rebuild database after upgrading from rpm5
 # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985
 #
 # Conditional build:
@@ -12,9 +11,12 @@
 
 %define		db_ver		5.3.28.0
 %define		popt_ver	1.15
-%define		openssl_ver	1.1.1d
 %define		sover		9.1.0
 
+%if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
+%define	with_recommends_tags	1
+%endif
+
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
 Summary(es.UTF-8):	Gestor de paquetes RPM
@@ -24,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.1
+Release:	0.8
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -38,7 +40,6 @@ Source4:	%{name}.sysconfig
 Source5:	%{name}.groups
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-install-tree
-Source8:	%{name}-hrmib-cache
 Source9:	%{name}-user_group.sh
 # http://svn.pld-linux.org/banner.sh/
 Source10:	banner.sh
@@ -55,7 +56,6 @@ Patch1:		%{name}-popt-aliases.patch
 Patch2:		%{name}-perl-macros.patch
 Patch3:		%{name}-perl-req-perlfile.patch
 Patch4:		%{name}-scripts-closefds.patch
-Patch5:		%{name}-lua.patch
 Patch6:		%{name}-perl_req-INC_dirs.patch
 Patch7:		%{name}-debuginfo.patch
 Patch8:		%{name}-libtool-deps.patch
@@ -69,7 +69,17 @@ Patch15:	x32.patch
 Patch16:	rpm5-db-compat.patch
 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
+Patch26:	allow-at-in-ver-rel.patch
+Patch27:	no-exeonly-for-elf-reqprov.patch
 URL:		https://rpm.org/
+BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1.4
@@ -77,8 +87,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
@@ -88,14 +99,15 @@ BuildRequires:	libselinux-devel >= 2.1.0
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 1:1.4.2-9
-BuildRequires:	lua53-devel >= 5.3.5
 BuildRequires:	ossp-uuid-devel
 BuildRequires:	patch >= 2.2
+BuildRequires:	pkgconfig(lua) >= 5.1
 BuildRequires:	popt-devel >= %{popt_ver}
 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
@@ -113,7 +125,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
@@ -121,7 +133,6 @@ Recommends:	rpm-plugin-prioreset
 Recommends:	rpm-plugin-syslog
 Recommends:	rpm-plugin-systemd-inhibit
 %endif
-Obsoletes:	rpm-getdeps
 Obsoletes:	rpm-utils-perl
 Obsoletes:	rpm-utils-static
 Conflicts:	glibc < 2.2.92
@@ -218,7 +229,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
@@ -244,7 +254,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
@@ -539,7 +549,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
@@ -553,6 +562,15 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
@@ -580,7 +598,6 @@ sed -i \
 	-e 's|@host_os@|%{_target_os}|' \
 	macros.in
 
-CPPFLAGS="-I/usr/include/lua53 %{rpmcppflags}"
 %configure \
 	WITH_PERL_VERSION=no \
 	__GST_INSPECT=%{_bindir}/gst-inspect-1.0 \
@@ -592,10 +609,10 @@ CPPFLAGS="-I/usr/include/lua53 %{rpmcppflags}"
 	--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 \
@@ -628,7 +645,7 @@ cd python
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \
-	$RPM_BUILD_ROOT{/var/lib/{banner,rpm},/var/cache/hrmib}
+	$RPM_BUILD_ROOT/var/lib/{banner,rpm}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
@@ -665,7 +682,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
@@ -675,13 +695,20 @@ 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
 
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/banner.sh
@@ -747,9 +774,6 @@ if [ -e /var/lib/rpm/Packages ] && \
 	%{_rpmlibdir}/dbupgrade.sh
 fi
 
-%triggerpostun -- %{name} < 4.4.9-44
-%{_rpmlibdir}/hrmib-cache
-
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
@@ -771,6 +795,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*
@@ -786,10 +812,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir /var/lib/rpm
 
-# exported package NVRA (stamped with install tid)
-# net-snmp hrSWInstalledName queries, bash-completions
-%dir /var/cache/hrmib
-
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/macros
@@ -811,6 +833,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
@@ -826,8 +851,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir %{_rpmlibdir}/pld
 
-%attr(755,root,root) %{_rpmlibdir}/hrmib-cache
-
 %attr(755,root,root) %{_rpmlibdir}/dbupgrade.sh
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_checkversion
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_reset