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