From 153e4f95f1ffcca02d4ced59fa554fb8c1a53819 Mon Sep 17 00:00:00 2001
From: "ramiro%fateware.com" <ramiro%fateware.com>
Date: Fri, 22 Oct 1999 05:55:29 +0000
Subject: [PATCH] More rpm work in progress.  Work around some bugs in
 rules.mk.

---
 build/package/rpm/generate-package-info.sh       | 2 ++
 build/package/rpm/mozilla-core-module-list.txt   | 3 ++-
 build/package/rpm/mozilla-layout-module-list.txt | 1 +
 build/package/rpm/print-module-filelist.sh       | 7 +++++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/package/rpm/generate-package-info.sh b/build/package/rpm/generate-package-info.sh
index f1fce2a13e90..c43e209cef69 100755
--- a/build/package/rpm/generate-package-info.sh
+++ b/build/package/rpm/generate-package-info.sh
@@ -72,6 +72,8 @@ do
 
 	rm -f $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
 
+	touch $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
+
 	print_cmd=$mozdir/build/package/rpm/print-module-filelist.sh
 
 	here=`pwd`
diff --git a/build/package/rpm/mozilla-core-module-list.txt b/build/package/rpm/mozilla-core-module-list.txt
index 18fe25614f63..d065a3c996ea 100644
--- a/build/package/rpm/mozilla-core-module-list.txt
+++ b/build/package/rpm/mozilla-core-module-list.txt
@@ -1,9 +1,10 @@
-dbm
+db
 xpcom
 intl
 js
 modules/security/freenav
 modules/libpref
 modules/libimg
+modules/libjar
 caps
 
diff --git a/build/package/rpm/mozilla-layout-module-list.txt b/build/package/rpm/mozilla-layout-module-list.txt
index fead88b7cbc2..454a91e94700 100644
--- a/build/package/rpm/mozilla-layout-module-list.txt
+++ b/build/package/rpm/mozilla-layout-module-list.txt
@@ -2,6 +2,7 @@ htmlparser
 gfx
 dom
 view
+widget/timer
 widget
 layout
 webshell
diff --git a/build/package/rpm/print-module-filelist.sh b/build/package/rpm/print-module-filelist.sh
index 06a2341867e2..d75a0edd09f3 100755
--- a/build/package/rpm/print-module-filelist.sh
+++ b/build/package/rpm/print-module-filelist.sh
@@ -25,6 +25,9 @@ list2=/tmp/list2-$$.txt
 
 rm -rf $dist $list $list2
 
+mkdir -p $dist
+mkdir -p $dist/include
+
 make -s DIST=$dist XPDIST=$dist PUBLIC=$dist/include EXTRA_DEPS= >/dev/null 2>&1
 
 cd $dist
@@ -49,11 +52,9 @@ do
 		# Dont output files in "lib/" that are duplicated in "bin/"
 		if [ -f "$bin_dup" ]
 		then
-			#echo "skipping $i"
 			skip="true"
 		fi
 
-
 		# Test for files that need to be skipped
 		file=`basename $i`
 
@@ -84,6 +85,8 @@ do
 	if [ "$skip" != "true" ]
 	then
 		echo $i >> $list2
+#	else
+#		echo "skipping $i"
 	fi
 done