From 4d6e8873a13bedac1a7c92549c0337337f54cef2 Mon Sep 17 00:00:00 2001
From: James Simmons <uja.ornl@gmail.com>
Date: Mon, 9 Dec 2013 12:14:52 -0500
Subject: [PATCH] LU-3953 rpm: stop using unnecessary file lists

File lists are being generated for unconditonally packaged files.

RPM can handle both static and dynamic file lists, so let's use them.
It simplifies the spec file quite a bit.

There are also some files that are treated as being conditionally
included but the conditions are always true:

- lustre_types.h was removed in commit adde80ff (v1.9.50)
- libcfsutil.a was made unconditional in commit b279ac68 (v2.3.51)
- include/lustre/lustre_idl.h was added in commit 11330397 (v1.7.100)

I've removed the conditionals surrounding these and moved them into
the static file lists.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I3f08a40f3ffef468723b366848ed5645c4cb9de9
Reviewed-on: http://review.whamcloud.com/5489
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre.spec.in | 74 ++++++++++++++++++++++++----------------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/lustre.spec.in b/lustre.spec.in
index 3e2dddb..487a08d 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -327,38 +327,7 @@ chmod -R go-w lustre-source/lustre-%{version}
 # fc18 needs 'x' permission for library files
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
 
-cat >lustre.files <<EOF
-%{?rootdir}/sbin/mount.lustre
-%{_sbindir}/*
-%{_bindir}/lfs
-%{_bindir}/lfs_migrate
-%{_bindir}/llbackup
-%{_bindir}/llobdstat
-%{_bindir}/llstat
-%{_bindir}/lustre_req_history
-%{_bindir}/plot-llstat
-%{_bindir}/req_layout
-%{_libdir}/libptlctl.a
-%{_libdir}/liblustreapi.a
-%{_libdir}/liblustreapi.so
-%{_mandir}/man?/*
-%{_datadir}/lustre
-%{_includedir}/lustre
-%{_includedir}/libcfs
-%{_libexecdir}/lustre/lc_common
-%{_sysconfdir}/udev/rules.d/99-lustre.rules
-%{_sysconfdir}/init.d/lnet
-%{_sysconfdir}/init.d/lustre
-%config(noreplace) %{_sysconfdir}/ldev.conf
-%{_sysconfdir}/sysconfig/lustre
-%{_libexecdir}/lustre/haconfig
-%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%{_sysconfdir}/ha.d/resource.d/Lustre
-EOF
-
-if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
-  echo '%{_libdir}/libcfsutil.a' >>lustre.files
-fi
+:> lustre.files
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
   echo '%{_libdir}/liblustre.a' >>lustre.files
@@ -374,19 +343,8 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
   echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 
-# Have universal lustre headers
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
-  echo '%{_includedir}/linux/lustre_user.h' >>lustre.files
-else
-  echo '%{_includedir}/linux/lustre_idl.h' >>lustre.files
-fi
-
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then
-  echo '%{_includedir}/linux/lustre_types.h' >>lustre.files
-fi
-
 %if %{with lustre_tests}
-echo '%{_libdir}/lustre/tests/*' >lustre-tests.files
+echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
 echo '%{_bindir}/mcreate' >>lustre-tests.files
 echo '%{_bindir}/munlink' >>lustre-tests.files
 %if %{with lustre_modules}
@@ -424,6 +382,34 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko"
 
 %files -f lustre.files
 %defattr(-,root,root)
+%{?rootdir}/sbin/mount.lustre
+%{_sbindir}/*
+%{_bindir}/lfs
+%{_bindir}/lfs_migrate
+%{_bindir}/llbackup
+%{_bindir}/llobdstat
+%{_bindir}/llstat
+%{_bindir}/lustre_req_history
+%{_bindir}/plot-llstat
+%{_bindir}/req_layout
+%{_libdir}/libptlctl.a
+%{_libdir}/libcfsutil.a
+%{_libdir}/liblustreapi.a
+%{_libdir}/liblustreapi.so
+%{_mandir}/man?/*
+%{_datadir}/lustre
+%{_includedir}/lustre
+%{_includedir}/libcfs
+%{_includedir}/linux/lustre_user.h
+%{_libexecdir}/lustre/lc_common
+%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%{_sysconfdir}/init.d/lnet
+%{_sysconfdir}/init.d/lustre
+%config(noreplace) %{_sysconfdir}/ldev.conf
+%{_sysconfdir}/sysconfig/lustre
+%{_libexecdir}/lustre/haconfig
+%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
+%{_sysconfdir}/ha.d/resource.d/Lustre
 
 %if %{with lustre_modules}
 %files modules
-- 
1.8.3.1