From adeab9e9d8e33bc3b7dcfe7597975fdff767be34 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 18 Jan 2000 05:36:42 +0000
Subject: [PATCH] quakeforge.spec.in: 	a few corrections to get rpms
 building. NOTE: THIS WILL NOT WORK FOR 	-pre VERSIONS because rpm
 doesn't like `-' in the version string. common/gl_rsurf.c: 	experimentally
 comment out some code that /seems/ to fix the 	r_{water,mirror}alpha bug.

---
 common/gl_rsurf.c  |  5 +++++
 quakeforge.spec.in | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/common/gl_rsurf.c b/common/gl_rsurf.c
index 36517a2..4eb1cf8 100644
--- a/common/gl_rsurf.c
+++ b/common/gl_rsurf.c
@@ -1069,8 +1069,13 @@ void DrawTextureChains (void)
 		}
 		else
 		{
+#ifndef _EXPERIMENTAL_
+			/* XXX this one is wierd. If both wateralpha and mirror alpha
+			   are !=1.0, you can see the water though walls and floors.
+			*/
 			if ((s->flags & SURF_DRAWTURB) && r_wateralpha.value != 1.0)
 				continue;	// draw translucent water later
+#endif
 			for ( ; s ; s=s->texturechain)
 				R_RenderBrushPoly (s);
 		}
diff --git a/quakeforge.spec.in b/quakeforge.spec.in
index ad7eb32..3a1eac3 100644
--- a/quakeforge.spec.in
+++ b/quakeforge.spec.in
@@ -33,7 +33,6 @@ Group: Amusements/Games
 Requires: quakeforge
 
 %description server
-%endif
 
 %if "%{HAS_OGL}"=="'yes'"
 %package gl
@@ -111,7 +110,7 @@ Requires: quakeforge
 %setup -q
 
 %build
-%if "%{SND_STYLE}"==ALSA
+%if "%{SND_STYLE}"=="'ALSA'"
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --enable-alsa
 %else
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
@@ -120,6 +119,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/games/quake
+mkdir -p $RPM_BUILD_ROOT/usr/games/quake/id1
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 %files
@@ -137,43 +138,43 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 %endif
 
 %if "%{HAS_TDFXGL}"=="'yes'"
-%files gl
+%files 3dfx
 /usr/bin/quake-3dfx
 /usr/bin/qw-client-3dfx
 %endif
 
 %if "%{HAS_X11}"=="'yes'"
-%files gl
+%files x11
 /usr/bin/quake-x11
 /usr/bin/qw-client-x11
 %endif
 
 %if "%{HAS_SVGA}"=="'yes'"
-%files gl
+%files svga
 /usr/bin/quake-svga
 /usr/bin/qw-client-svga
 %endif
 
 %if "%{HAS_VGA}"=="'yes'"
-%files gl
+%files vga
 /usr/bin/quake-vga
 /usr/bin/qw-client-vga
 %endif
 
 %if "%{HAS_MGL}"=="'yes'"
-%files gl
+%files gml
 /usr/bin/quake-mgl
 /usr/bin/qw-client-mgl
 %endif
 
 %if "%{HAS_GGI}"=="'yes'"
-%files gl
+%files ggi
 /usr/bin/quake-ggi
 /usr/bin/qw-client-ggi
 %endif
 
 %if "%{HAS_SDL}"=="'yes'"
-%files gl
+%files sdl
 /usr/bin/quake-sdl
 /usr/bin/qw-client-sdl
 %endif