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