From: Christopher J. Morrone <morrone2@llnl.gov>
Date: Thu, 28 Jan 2016 01:55:48 +0000 (-0500)
Subject: LU-3953 build: Fix duplicate snmp directory packaging
X-Git-Tag: 2.7.90~23
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e60e275546224a5141dde3ac75087b8da3795616

LU-3953 build: Fix duplicate snmp directory packaging

The %{_datadir}/lustre/snmp/mibs is in conflict with the later
%{_datadir}/lustre in the %files section.  Fortunately, it just
prints a warning rather than aborting the process.  But we can
fix that warning.

We remove the more specific %{_datadir}/lustre/snmp/mibs since
the files are already included with the more general form.

Change-Id: I293f0bf07760719f7cf3e1a963e49c007a483311
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/18191
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index cbf123e..ff1caf6 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -405,7 +405,6 @@ echo '%{_libdir}/libiam.a' >>lustre.files
 
 if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
 	echo '%{_libdir}/lustre/snmp' >>lustre.files
-	echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 
 find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \