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