d1681e
From 09a7493dcf0f88aa47a176ab0372289664578fb7 Mon Sep 17 00:00:00 2001
d1681e
From: moagrawa <moagrawa@redhat.com>
d1681e
Date: Mon, 15 Jan 2018 18:21:27 +0530
d1681e
Subject: [PATCH 127/128] spec: unpackaged files found for RHEL-7 client build
d1681e
d1681e
Problem: unpackages files found for RHEL-7 client build
d1681e
d1681e
Solution: Update glusterfs.specs.in to exclude unpackage files
d1681e
Label: DOWNSTREAM ONLY
d1681e
d1681e
BUG: 1534530
d1681e
Change-Id: I761188a6a8447105b53bf3334ded963c645cab5b
d1681e
Signed-off-by: moagrawa <moagrawa@redhat.com>
d1681e
Reviewed-on: https://code.engineering.redhat.com/gerrit/127758
d1681e
Tested-by: RHGS Build Bot <nigelb@redhat.com>
d1681e
Reviewed-by: Milind Changire <mchangir@redhat.com>
d1681e
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
d1681e
---
d1681e
 glusterfs.spec.in | 6 ++++--
d1681e
 1 file changed, 4 insertions(+), 2 deletions(-)
d1681e
d1681e
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
d1681e
index cb273f5..abebb28 100644
d1681e
--- a/glusterfs.spec.in
d1681e
+++ b/glusterfs.spec.in
d1681e
@@ -1219,9 +1219,11 @@ exit 0
d1681e
 %exclude %{_libdir}/pkgconfig/libgfdb.pc
d1681e
 %exclude %{_sbindir}/gluster-setgfid2path
d1681e
 %exclude %{_mandir}/man8/gluster-setgfid2path.8*
d1681e
+%if ( 0%{?_with_systemd:1} )
d1681e
 %exclude %{_datadir}/glusterfs/scripts/control-cpu-load.sh
d1681e
 %exclude %{_datadir}/glusterfs/scripts/control-mem.sh
d1681e
 %endif
d1681e
+%endif
d1681e
 
d1681e
 %files api
d1681e
 %exclude %{_libdir}/*.so
d1681e
@@ -2181,8 +2183,8 @@ fi
d1681e
 %endif
d1681e
 
d1681e
 %changelog
d1681e
-* Tue Jan 16 2018 Mohit Agrawal <moagrawa@redhat.com>
d1681e
-- Exclude control-cpu-load.sh and control-mem.sh from client builds
d1681e
+* Wed Jan 17 2018 Mohit Agrawal <moagrawa@redhat.com>
d1681e
+- Exclude control-cpu-load.sh and control-mem.sh for RHEL_7 client builds only (#1534530)
d1681e
 
d1681e
 * Wed Dec 20 2017 Milind Changire <mchangir@redhat.com>
d1681e
 - Remove ExclusiveArch directive to help building on non-x86_64 arches (#1527772)
d1681e
-- 
d1681e
1.8.3.1
d1681e