- platform fixes

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 35e2370ce9882ccd1dde8eb1d4d818458429aaa3..c41eff45830ef4222a1b0c125e12e6758751b7d1 100644 (file)
--- 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.2
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -55,7 +57,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 +70,12 @@ 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
 URL:           https://rpm.org/
+BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1.4
@@ -77,8 +83,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 +95,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 +121,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 +129,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 +225,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 +250,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 +545,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 +558,10 @@ 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
 
 install %{SOURCE15} scripts/perl.prov.in
 
@@ -580,7 +589,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 \
@@ -595,7 +603,6 @@ CPPFLAGS="-I/usr/include/lua53 %{rpmcppflags}"
        --enable-ndb \
        --enable-sqlite \
        --enable-zstd \
-       --with-crypto=openssl \
        --with-lua \
        %{?with_imaevm:--with-imaevm} \
        --with-cap \
@@ -665,7 +672,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
@@ -811,6 +821,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