From ba7ab28fe40980d60a41956408c9c5b0862fa51c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 25 Jan 2000 04:45:07 +0000
Subject: [PATCH] merge in changes from the Release_0_1 branch

---
 rpm/build_rpm.in | 13 +++++++++++--
 rpm/rpmrc        |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 rpm/rpmrc

diff --git a/rpm/build_rpm.in b/rpm/build_rpm.in
index 6366d20..38fd59c 100755
--- a/rpm/build_rpm.in
+++ b/rpm/build_rpm.in
@@ -2,9 +2,14 @@
 
 version=@QF_VERSION@
 temp_dir=/var/tmp
+srcdir=@srcdir@
+if [ "$srcdir" = "." ]; then
+    srcdir=..
+fi
 
+mkdir -p BUILD SPECS RPMS/{noarch,i386,i686} SOURCES SRPMS
 rm -rf ${temp_dir}/quakeforge-${version}
-cp -a @srcdir@ ${temp_dir}/quakeforge-${version}
+cp -a $srcdir ${temp_dir}/quakeforge-${version}
 dest_dir=$PWD
 cd ${temp_dir}/quakeforge-${version}
 # this is needed to ensure there is a makefile
@@ -12,6 +17,10 @@ cd ${temp_dir}/quakeforge-${version}
 ./configure
 make distclean
 cd ${temp_dir}
-tar zcf ${dest_dir}/quakeforge-${version}.tar.gz quakeforge-${version}
+tar zcf ${dest_dir}/SOURCES/quakeforge-${version}.tar.gz quakeforge-${version}
 cd ${dest_dir}
 rm -rf ${temp_dir}/quakeforge-${version}
+cat > rpmmacros <<EOF
+%_topdir $PWD
+EOF
+rpm -ba quakeforge.spec --rcfile rpmrc
diff --git a/rpm/rpmrc b/rpm/rpmrc
new file mode 100644
index 0000000..21978ea
--- /dev/null
+++ b/rpm/rpmrc
@@ -0,0 +1 @@
+macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:rpmmacros