X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;fp=rpm.spec;h=a829a4c001dd054112d2ae572c3820fd0afa372a;hp=cfd989d24709e7269dbb2c568271a2ec988fe6fc;hb=2da2e08da47118981f1c689c694a75121d836881;hpb=9d8d74f5601710e62667ceda1480924ec14d8c1e diff --git a/rpm.spec b/rpm.spec index cfd989d..a829a4c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -14,7 +14,7 @@ %define db_ver 5.3.28.0 %define popt_ver 1.15 -%define sover 9.1.2 +%define sover 9.1.3 %if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5" %define with_recommends_tags 1 @@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 4.16.1.2 -Release: 9 +Version: 4.16.1.3 +Release: 6 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base Source0: http://ftp.rpm.org/releases/rpm-4.16.x/%{name}-%{version}.tar.bz2 -# Source0-md5: 0d10f63a0a4c9517cf3808a601378399 +# Source0-md5: 576277fafa5d0681a8a92c8716aca5f0 Source1: https://ftp.tld-linux.org/TLD/TLD-Linux.asc # Source1-md5: 5b5caff8c570489ad5bf950734546c24 Source2: macros.local @@ -61,6 +61,7 @@ Patch1: %{name}-popt-aliases.patch Patch2: %{name}-perl-macros.patch Patch3: %{name}-perl-req-perlfile.patch Patch4: %{name}-scripts-closefds.patch +Patch5: %{name}-dir-macros-relative.patch Patch6: %{name}-perl_req-INC_dirs.patch Patch7: %{name}-debuginfo.patch Patch8: %{name}-libtool-deps.patch @@ -76,7 +77,7 @@ Patch17: python-internal-build.patch Patch18: missing-macros.patch Patch19: pkgconfig.patch Patch20: uname-deps.patch -Patch21: aarch64.patch +Patch21: arm_abi.patch Patch22: ix86-platforms.patch Patch23: shortcircuited-deps.patch Patch24: cpuinfo-deps.patch @@ -102,12 +103,12 @@ BuildRequires: db-devel >= %{db_ver} %{?with_systemd:BuildRequires: dbus-devel >= 1.3} BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-tools >= 0.19.2 +%{?with_imaevm:BuildRequires: ima-evm-utils-devel >= 1.0} BuildRequires: libarchive-devel BuildRequires: libcap-devel BuildRequires: libmagic-devel BuildRequires: libgcrypt-devel BuildRequires: libgomp-devel >= 6:4.5 -%{?with_imaevm:BuildRequires: libimaevm-devel >= 1.0} %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.0} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros BuildRequires: libstdc++-devel @@ -137,7 +138,7 @@ BuildRequires: tetex-pdftex Requires(posttrans): coreutils Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Requires: rpm-tld-macros >= 1.744 +Requires: rpm-tld-macros >= 2.002 Requires: FHS >= 3.0-2 Requires: libgcrypt Requires: popt >= %{popt_ver} @@ -598,6 +599,7 @@ 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