Blob Blame History Raw
From 425af813ea4eb851f8827a1cd7f59daf5eabfdbe Mon Sep 17 00:00:00 2001
From: Milind Changire <mchangir@redhat.com>
Date: Tue, 27 Sep 2016 11:45:51 +0530
Subject: [PATCH 89/94] build: add systemd dependency

Installs break with glusterfs getting installed before systemd
installation. This patch adds a dependency for systemd appropriately
for Fedora and RHEL platforms for glusterfs-server and glusterfs-events
packages.

> Reviewed-on: http://review.gluster.org/15469
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

(cherry picked from commit 73c6c2c307c8bcaac51aa94b1af518955f35d1b8)

> Reviewed-on: http://review.gluster.org/15508
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>

(cherry picked from commit 0268156dda0995124183f52b3f1e9e9538734772)

Change-Id: Ica18f82a5e37c7755f0d386ce2ac6c70e8082815
BUG: 1377062
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/85550
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 glusterfs.spec.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index d6a8f4c..2bcb1ff 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -562,7 +562,7 @@ Requires:         psmisc
 Requires:         lvm2
 Requires:         nfs-utils
 %if ( 0%{?_with_systemd:1} )
-Requires(post):   systemd-units
+Requires(post):   systemd-units, systemd
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 %else
@@ -622,6 +622,9 @@ Requires:         python-gluster = %{version}-%{release}
 %if ( 0%{?rhel} && 0%{?rhel} <= 6 )
 Requires:         python-argparse
 %endif
+%if ( 0%{?_with_systemd:1} )
+Requires(post):   systemd
+%endif
 
 %description events
 GlusterFS Events
@@ -2011,6 +2014,9 @@ end
 %endif
 
 %changelog
+* Tue Sep 27 2016 Milind Changire <mchangir@redhat.com>
+- Added systemd requirement to glusterfs-server and glusterfs-events packages
+
 * Fri Sep 16 2016 Avra Sengupta <asengupt@redhat.com>
 - Added conf.py for snap scheduler
 
-- 
1.7.1