From: Arnaud Guignard <arnaud.guignard@cea.fr>
Date: Thu, 30 Apr 2015 12:33:23 +0000 (+0200)
Subject: LU-6546 rpm: exclude duplicate binaries
X-Git-Tag: 2.7.54~18
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b77a954c48a3f1357255f9273a27db777ed7f91f;ds=sidebyside

LU-6546 rpm: exclude duplicate binaries

Exclude /usr/sbin/wirecheck and /usr/sbin/wiretest binaries from lustre
package to avoid duplicate binaries in lustre and lustre-tests packages.

Change-Id: I59674fa5d1263a7e8022e6008556bf35a2de477b
Signed-off-by: Arnaud Guignard <arnaud.guignard@cea.fr>
Reviewed-on: http://review.whamcloud.com/14646
Tested-by: Jenkins
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 4f6f6ca..c20ff84 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -447,6 +447,8 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*
+%exclude %{_sbindir}/wirecheck
+%exclude %{_sbindir}/wiretest
 %if %{with zfs}
 %exclude %{_sbindir}/zfsobj2fid
 %endif