|
 |
3604df |
From 425af813ea4eb851f8827a1cd7f59daf5eabfdbe Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Date: Tue, 27 Sep 2016 11:45:51 +0530
|
|
|
3604df |
Subject: [PATCH 89/94] build: add systemd dependency
|
|
|
3604df |
|
|
|
3604df |
Installs break with glusterfs getting installed before systemd
|
|
|
3604df |
installation. This patch adds a dependency for systemd appropriately
|
|
|
3604df |
for Fedora and RHEL platforms for glusterfs-server and glusterfs-events
|
|
|
3604df |
packages.
|
|
|
3604df |
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15469
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
(cherry picked from commit 73c6c2c307c8bcaac51aa94b1af518955f35d1b8)
|
|
|
3604df |
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/15508
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
> Tested-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
(cherry picked from commit 0268156dda0995124183f52b3f1e9e9538734772)
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ica18f82a5e37c7755f0d386ce2ac6c70e8082815
|
|
|
3604df |
BUG: 1377062
|
|
|
3604df |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/85550
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
glusterfs.spec.in | 8 +++++++-
|
|
|
3604df |
1 files changed, 7 insertions(+), 1 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index d6a8f4c..2bcb1ff 100644
|
|
|
3604df |
--- a/glusterfs.spec.in
|
|
|
3604df |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -562,7 +562,7 @@ Requires: psmisc
|
|
|
3604df |
Requires: lvm2
|
|
|
3604df |
Requires: nfs-utils
|
|
|
3604df |
%if ( 0%{?_with_systemd:1} )
|
|
|
3604df |
-Requires(post): systemd-units
|
|
|
3604df |
+Requires(post): systemd-units, systemd
|
|
|
3604df |
Requires(preun): systemd-units
|
|
|
3604df |
Requires(postun): systemd-units
|
|
|
3604df |
%else
|
|
|
3604df |
@@ -622,6 +622,9 @@ Requires: python-gluster = %{version}-%{release}
|
|
|
3604df |
%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
|
|
|
3604df |
Requires: python-argparse
|
|
|
3604df |
%endif
|
|
|
3604df |
+%if ( 0%{?_with_systemd:1} )
|
|
|
3604df |
+Requires(post): systemd
|
|
|
3604df |
+%endif
|
|
|
3604df |
|
|
|
3604df |
%description events
|
|
|
3604df |
GlusterFS Events
|
|
|
3604df |
@@ -2011,6 +2014,9 @@ end
|
|
|
3604df |
%endif
|
|
|
3604df |
|
|
|
3604df |
%changelog
|
|
|
3604df |
+* Tue Sep 27 2016 Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
+- Added systemd requirement to glusterfs-server and glusterfs-events packages
|
|
|
3604df |
+
|
|
|
3604df |
* Fri Sep 16 2016 Avra Sengupta <asengupt@redhat.com>
|
|
|
3604df |
- Added conf.py for snap scheduler
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|