rpms/prboom/devel prboom.spec,1.4,1.5

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/devel

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prboom.spec	21 Apr 2006 21:37:55 -0000	1.4
+++ prboom.spec	22 Apr 2006 22:38:38 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -29,8 +29,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -52,6 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -62,6 +73,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1