From: Kefu Chai Date: Wed, 12 Feb 2020 04:24:50 +0000 (+0800) Subject: rpm: define weak_deps for el8 X-Git-Tag: v14.2.10~69^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a29daed4034bdbf800cc00917ba7124d38d6c299;p=ceph.git rpm: define weak_deps for el8 RHEL/CentOS 8 comes with rpm 4.14, see https://centos.pkgs.org/8/centos-baseos-x86_64/rpm-4.14.2-25.el8.x86_64.rpm.html and https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/packaging_and_distributing_software/new-features-in-rhel-8_packaging-and-distributing-software and since "Recommends" was introduced by rpm 4.12, see https://fedoraproject.org/wiki/Changes/RPM-4.12 . so we are able to use "Recommends" in el8 as well. Signed-off-by: Kefu Chai (cherry picked from commit 5c70f3611160d316e4065c0c1798ecd8c24fb2c3) Conflicts: ceph.spec.in: - keep Python 2 conditional and add RHEL 8 reference --- diff --git a/ceph.spec.in b/ceph.spec.in index 15d8e9be015a..84ed1685842e 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -78,7 +78,7 @@ %if 0%{without python2} %global _defined_if_python2_absent 1 %endif -%if 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 %global weak_deps 1 %endif %if %{with selinux}