make -lib depend on elfutils-libs instead of elfutils; rel 7

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index bd3974cb38a7c445d85bd36d8698fb481e849d8a..4ebca67171db31f2dc25967808a5c42105df38b3 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.17.1.1
-Release:       3
+Release:       7
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -94,6 +94,8 @@ 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
+Patch40:       perl-heredoc-matching.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -242,8 +244,7 @@ Zawiera on:
 Summary:       RPMs library
 Summary(pl.UTF-8):     Biblioteki RPM-a
 Group:         Libraries
-Requires:      elfutils >= 0.159
-Requires:      elfutils-libelf >= 0.159
+Requires:      elfutils-libs >= 0.159
 Requires:      libmagic >= 1.15-2
 Requires:      popt >= %{popt_ver}
 Requires:      sqlite3-libs >= 3.22.0
@@ -275,6 +276,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
@@ -672,6 +674,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
+%patch40 -p1
 
 %{__rm} po/*.gmo
 
@@ -1128,12 +1132,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_libdir}/rpm-plugins/fapolicyd.so
 %{_mandir}/man8/rpm-plugin-fapolicyd.8*
 
+%if %{with systemd}
 %files plugin-dbus-announce
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/rpm-plugins/dbus_announce.so
 %{_mandir}/man8/rpm-plugin-dbus-announce.8*
 %{_sysconfdir}/dbus-1/system.d/org.rpm.conf
 %endif
+%endif
 
 %files sign
 %defattr(644,root,root,755)