From df4ecf260bc97d0dd5a7185a4d2e48419bea3f0d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 30 Aug 2000 23:20:57 +0000
Subject: [PATCH] can now build rpms

---
 RPM/.gitignore      |  6 ++++++
 RPM/build_rpm.in    | 14 ++------------
 RPM/rpmrc           |  1 +
 include/Makefile.am |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 RPM/rpmrc

diff --git a/RPM/.gitignore b/RPM/.gitignore
index ae44177..ba501a4 100644
--- a/RPM/.gitignore
+++ b/RPM/.gitignore
@@ -2,3 +2,9 @@ Makefile
 Makefile.in
 build_rpm
 nuq.spec
+rpmmacros
+BUILD
+RPMS
+SOURCES
+SPECS
+SRPMS
diff --git a/RPM/build_rpm.in b/RPM/build_rpm.in
index 877f035..27c3856 100644
--- a/RPM/build_rpm.in
+++ b/RPM/build_rpm.in
@@ -9,18 +9,8 @@ fi
 
 rm -rf BUILD SPECS RPMS SOURCES SRPMS
 mkdir -p BUILD SPECS RPMS/{noarch,i386,i686} SOURCES SRPMS
-rm -rf ${temp_dir}/nuq-${version}
-cp -a $srcdir ${temp_dir}/nuq-${version}
-dest_dir=$PWD
-cd ${temp_dir}/nuq-${version}
-# this is needed to ensure there is a makefile
-./bootstrap
-./configure
-make distclean
-cd ${temp_dir}
-tar zcf ${dest_dir}/SOURCES/nuq-${version}.tar.gz nuq-${version}
-cd ${dest_dir}
-rm -rf ${temp_dir}/nuq-${version}
+(cd ${srcdir}; make dist)
+mv ${srcdir}/nuq-${version}.tar.gz SOURCES
 cat > rpmmacros <<EOF
 %_topdir $PWD
 EOF
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
diff --git a/include/Makefile.am b/include/Makefile.am
index eaa504f..5801457 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_ia32.h \
-	bspfile.h block16.h cdaudio.h chase.h client.h cmd.h compat.h \
+	bspfile.h block16.h cdaudio.h chase.h client.h checksum.h cmd.h compat.h \
 	conproc.h console.h context_x11.h crc.h cvar.h \
 	dga_check.h d_iface.h d_ifacea.h d_local.h dosisms.h draw.h \
 	gcc_attr.h gib_error.h gib.h gib_instructions.h \
-	gib_interpret.h gib_modules.h gib_parse.h gib_vars.h glquake.h \
+	gib_interpret.h gib_modules.h gib_parse.h gib_stack.h  gib_vars.h glquake.h \
 	gl_warp_sin.h host.h info.h input.h keys.h link.h mathlib.h mdfour.h menu.h \
 	modelgen.h model.h mpdosock.h msg.h net_bw.h net_dgrm.h net.h \
 	net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h net_vcr.h \