74b1de
From d6458c40706d8886187bd9c2016087a3a1eee882 Mon Sep 17 00:00:00 2001
74b1de
From: Milind Changire <mchangir@redhat.com>
74b1de
Date: Wed, 19 Dec 2018 13:17:42 +0530
74b1de
Subject: [PATCH 36/52] build: add conditional dependency on server for devel
74b1de
74b1de
Add conditional depedency on server for glusterfs-devel
74b1de
74b1de
Label: DOWNSTREAM ONLY
74b1de
74b1de
Change-Id: Icc45df3db137dbc03d240c1ac774b5c8735c5f2f
74b1de
Signed-off-by: Milind Changire <mchangir@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/159030
74b1de
Tested-by: RHGS Build Bot <nigelb@redhat.com>
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 glusterfs.spec.in | 7 +++++++
74b1de
 1 file changed, 7 insertions(+)
74b1de
74b1de
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
74b1de
index 9cd4372..9db5a34 100644
74b1de
--- a/glusterfs.spec.in
74b1de
+++ b/glusterfs.spec.in
74b1de
@@ -394,7 +394,9 @@ Requires:         %{name}%{?_isa} = %{version}-%{release}
74b1de
 Requires:         %{name}-extra-xlators%{?_isa} = %{version}-%{release}
74b1de
 %endif
74b1de
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
74b1de
+%if ( 0%{!?_without_server:1} )
74b1de
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
74b1de
+%endif
74b1de
 
74b1de
 %description devel
74b1de
 GlusterFS is a distributed file-system capable of scaling to several
74b1de
@@ -2067,6 +2069,11 @@ fi
74b1de
 * Thu Feb 21 2019 Jiffin Tony Thottan <jthottan@redhat.com>
74b1de
 - Obsoleting gluster-gnfs package
74b1de
 
74b1de
+* Wed Dec 19 2018 Milind Changire <mchangir@redhat.com>
74b1de
+- Add explicit package dependencies (#1656357)
74b1de
+- Remove absolute paths from spec file (#1350745)
74b1de
+- Do not package crypt.so for FIPS compliance (#1653224)
74b1de
+
74b1de
 * Wed Nov 28 2018 Krutika Dhananjay <kdhananj@redhat.com>
74b1de
 - Install /var/lib/glusterd/groups/distributed-virt by default
74b1de
 
74b1de
-- 
74b1de
1.8.3.1
74b1de