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