X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=cbb164815119f806a0c0de62fc226cbfc7e5e446;hb=900d9b79c80939ba0c3f0787dbc02e61cd890a86;hp=5ef74096a0f1358353229cf4542dd008e936e00c;hpb=7614db846db53bd75cafd0bf33fb766047db968b;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 5ef7409..cbb1648 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_with	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	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:	3
+Release:	1
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -94,6 +94,7 @@ Patch35:	pl-po.patch
 Patch36:	build-locale.patch
 Patch37:	no-exe-for-elf-req.patch
 Patch38:	gem-in-package-builddir.patch
+Patch39:	sqlite-log-crash.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -123,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
@@ -142,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
@@ -275,6 +270,7 @@ Requires:	bzip2-devel
 Requires:	elfutils-devel >= 0.159
 Requires:	libcap-devel
 Requires:	libgcrypt-devel
+Requires:	libgomp-devel >= 6:4.5
 Requires:	libmagic-devel
 %if %{with selinux}
 Requires:	libselinux-devel
@@ -341,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
@@ -672,6 +664,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 %{__rm} po/*.gmo
 
@@ -841,7 +834,9 @@ cd python
 cd ..
 %endif
 
+%if %{with plugins}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/rpm-plugins/*.la
+%endif
 
 # wrong location, not used anyway
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log}