From b3e86a66de224107f6760157a7cb692227e42954 Mon Sep 17 00:00:00 2001 From: Shwetha Acharya Date: Mon, 30 Aug 2021 18:54:15 +0530 Subject: [PATCH 610/610] glusterfs.spec.in: remove condtionals from tar dependency (#2734) * glusterfs.spec.in: remove condtionals from tar dependency The conditional on rhel minor version fails and tar is not marked as required. As there is not any universal macro to specify the minor release, removing the conditionals above the "Requires: tar" statement with this change irrespective of rhel 8.3 and above, tar will be marked required for geo-rep. > Change-Id: Id1e3320a0b1a245fc9cd8c7acb09cc119fca18b8 > Signed-off-by: Shwetha K Acharya Upstream patch: https://github.com/gluster/glusterfs/pull/2734 BUG: 1901468 Change-Id: Id1e3320a0b1a245fc9cd8c7acb09cc119fca18b8 Signed-off-by: Shwetha K Acharya Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/280116 Reviewed-by: Sunil Kumar Heggodu Gopala Acharya Tested-by: RHGS Build Bot --- glusterfs.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index a9a83b1..8b6646f 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -521,9 +521,8 @@ Requires: python%{_pythonver}-gluster = %{version}-%{release} Requires: rsync Requires: util-linux Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if ( 0%{?rhel} && ( ( 0%{?rhel} == 8 && 0%{?rhel_minor_version} >= 3 ) || 0%{?rhel} >= 9 ) ) Requires: tar -%endif + # required for setting selinux bools %if ( 0%{?rhel} && 0%{?rhel} >= 8 ) Requires(post): policycoreutils-python-utils -- 1.8.3.1