From: Arlin Davis <arlin.r.davis@intel.com>
Date: Thu, 22 May 2014 20:16:31 +0000 (-0700)
Subject: install: base package, without mpss, incorrectly tries to install /usr/sbin as file
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=18829ab3672b35d7ea2517bb7b341b7cf5cc7807;p=~ardavis%2Fdapl.git

install: base package, without mpss, incorrectly tries to install /usr/sbin as file

modify specfile and makefile to only install /usr/sbin/mpxyd
if built with mpss present. If files don't exist, mpss not
installed, make sure /usr/sbin is not incorrectly installed as a file.

Signed-off-by: Patrick Mccormick <patrick.m.mccormick@intel.com>
Ack-by: Arlin Davis <arlin.r.davis@intel.com>
---

diff --git a/Makefile.am b/Makefile.am
index 48c0595..31b0130 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -767,7 +767,10 @@ svc_mpxyd_CFLAGS = $(AM_CFLAGS) -lscif -libverbs -lpthread -Idat/include/
 sysconf_DATA += doc/mpxyd.conf
 
 install-exec-hook:
-	 install -D -m 755 mpxyd.init $(DESTDIR)$(sysconfdir)/init.d/mpxyd;
+	install -D -m 755 mpxyd.init $(DESTDIR)$(sysconfdir)/init.d/mpxyd;
+	echo %{_sbindir}/mpxyd > mcm-files
+	echo %{_sysconfdir}/init.d/mpxyd >> mcm-files
+	echo %{_sysconfdir}/mpxyd.conf >> mcm-files
 endif
 
 dist-hook: dapl.spec 
diff --git a/dapl.spec.in b/dapl.spec.in
index b82ab23..6972c55 100644
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -103,6 +103,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 # make init.d so we can exclude it later:
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
+touch mcm-files
 
 %clean
 rm -rf %{buildroot}
@@ -128,12 +129,10 @@ fi
 %postun 
 /sbin/ldconfig
 
-%files
+%files -f mcm-files
 %defattr(-,root,root,-)
 %{_libdir}/libda*.so.*
-%{_sbindir}
-%exclude %dir %{_sysconfdir}/init.d/
-%{_sysconfdir}/*
+%config %{_sysconfdir}/dat.conf
 %doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt README.mcm
 
 %files devel