From 24b37593679a8a3a3dbba14ff92ec92c6d83dbc6 Mon Sep 17 00:00:00 2001
From: Milind Changire <mchangir@redhat.com>
Date: Wed, 19 Dec 2018 13:17:42 +0530
Subject: [PATCH 495/495] build: add conditional dependency on server for devel
Add conditional depedency on server for glusterfs-devel
Label: DOWNSTREAM ONLY
BUG: 1656357
Change-Id: Icc45df3db137dbc03d240c1ac774b5c8735c5f2f
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/159030
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
glusterfs.spec.in | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 16dc5d7..0ad4ffc 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -339,7 +339,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-extra-xlators = %{version}-%{release}
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%if ( 0%{?_build_server} )
Requires: %{name}-server%{?_isa} = %{version}-%{release}
+%endif
%description devel
GlusterFS is a distributed file-system capable of scaling to several
@@ -2171,6 +2173,11 @@ fi
%endif
%changelog
+* Wed Dec 19 2018 Milind Changire <mchangir@redhat.com>
+- Add explicit package dependencies (#1656357)
+- Remove absolute paths from spec file (#1350745)
+- Do not package crypt.so for FIPS compliance (#1653224)
+
* Thu Dec 13 2018 Krutika Dhananjay <kdhananj@redhat.com>
- Install /var/lib/glusterd/groups/distributed-virt by default (#1653613)
--
1.8.3.1