From dd29144f7fa828ce47773ebe13e3017871633846 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 6 Dec 2023 18:03:24 +0100 Subject: [PATCH] - modified to allow building with rpm 4.5 --- rpm.spec | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/rpm.spec b/rpm.spec index d460ca1..b38ec09 100644 --- a/rpm.spec +++ b/rpm.spec @@ -3,15 +3,15 @@ # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985 # # Conditional build: -%bcond_without apidocs # Doxygen based API documentation -%bcond_without python3 # Python (3) bindings -%bcond_without plugins # plugins (all, including: audit, imaevm, selinux, systemd) -%bcond_without recommends_tags # use of Recommends tag (disable for bootstrapping) +%bcond_with apidocs # Doxygen based API documentation +%bcond_with python3 # Python (3) bindings +%bcond_with plugins # plugins (all, including: audit, imaevm, selinux, systemd) +%bcond_with recommends_tags # use of Recommends tag (disable for bootstrapping) %bcond_with imaevm # IMA/EVM signing support (requires libimaevm from ima-evm-utils) -%bcond_without audit # audit plugin -%bcond_without selinux # SELinux plugin +%bcond_with audit # audit plugin +%bcond_with selinux # SELinux plugin %bcond_with systemd # systemd inhibit plugin -%bcond_without fsverity # fsverity plugin +%bcond_with fsverity # fsverity plugin %define popt_ver 1.15 %define sover 9.3.0 @@ -34,7 +34,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.17.1.1 -Release: 5 +Release: 1 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -124,7 +124,7 @@ BuildRequires: python3-devel >= 1:3.2 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.750 %endif -BuildRequires: rpm-build >= 4.6 +BuildRequires: rpm-build BuildRequires: sqlite3-devel >= 3.22.0 BuildRequires: tcl BuildRequires: xz-devel @@ -143,12 +143,6 @@ Requires: FHS >= 3.0-2 Requires: libgcrypt Requires: popt >= %{popt_ver} Requires: rpm-tld-macros >= 2.002 -%if %{with recommends_tags} -Recommends: rpm-plugin-audit -Recommends: rpm-plugin-prioreset -Recommends: rpm-plugin-syslog -Recommends: rpm-plugin-systemd-inhibit -%endif Obsoletes: rpm-utils-perl < 1:4.15 Obsoletes: rpm-utils-static < 1:4.15 Conflicts: glibc < 2.2.92 @@ -343,10 +337,6 @@ Summary(pl.UTF-8): Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami Group: Applications/File Requires: %{name} = %{epoch}:%{version}-%{release} Requires: popt >= %{popt_ver} -%if %{with recommends_tags} -Recommends: bzip2 -Recommends: gzip -%endif Conflicts: filesystem-debuginfo < 3.0-16 %description utils -- 2.46.0