From c09b4b9ad19973be3e1cb3307509240c21af032a Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Mon, 28 Jan 2008 05:47:56 +0000
Subject: [PATCH] Branch HEAD b=13647 i=scjody i=adilger

Fixed the 'make rpms' issue.
---
 build/autoMakefile.am.toplevel | 1 +
 lustre/ChangeLog               | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 1084b12..dfb9624 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -59,6 +59,7 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
+	rm -f $(distdir)/ldiskfs/*.spec
 	find $(distdir) -name .deps -o \
 			-name CVS -o \
 			-name .svn -o \
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 216b287..929fdfa 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,6 +13,12 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : normal
+Bugzilla   : 13647
+Description: Lustre make rpms failed.
+Details    : Remove ldiskfs spec file to avoids rpmbuild be confused when
+             builds Lustre rpms from tarball.
+
+Severity   : normal
 Frequency  : rare on shutdown ost
 Bugzilla   : 14608
 Description: If llog cancel was not send before clean_exports phase, this can
-- 
1.8.3.1