rpms/prboom/devel .cvsignore, 1.6, 1.7 prboom.spec, 1.9, 1.10 sources, 1.6, 1.7 prboom-2.4.1-gamedir.patch, 1.2, NONE

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	.cvsignore prboom.spec sources 
Removed Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Update to 2.4.5; remove -gamedir patch that was accepted upstream.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jul 2006 20:46:22 -0000	1.6
+++ .cvsignore	16 Aug 2006 23:18:46 -0000	1.7
@@ -1 +1 @@
-prboom-2.4.4.tar.gz
+prboom-2.4.5.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- prboom.spec	30 Jul 2006 20:46:22 -0000	1.9
+++ prboom.spec	16 Aug 2006 23:18:46 -0000	1.10
@@ -1,15 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.4
+Version:        2.4.5
 Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.4.tar.gz
-Patch0:         prboom-2.4.1-gamedir.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -26,31 +25,19 @@
 
 %prep
 %setup -q
-%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=''
+%configure --enable-gl --disable-cpu-opt --program-prefix='' --with-waddir=%{waddir}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # Move the binaries out of the crufty /usr/games directory
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mv $RPM_BUILD_ROOT/usr/games/* $RPM_BUILD_ROOT/%{_bindir}
-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.
@@ -62,7 +49,6 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -73,6 +59,10 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Aug 12 2006 Wart <wart at kobold.org> 2.4.5-1
+- Update to 2.4.5
+- Remove gamedir patch as it was accepted upstream.
+
 * Sun Jul 23 2006 Wart <wart at kobold.org> 2.4.4-1
 - Update to 2.4.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jul 2006 20:46:22 -0000	1.6
+++ sources	16 Aug 2006 23:18:46 -0000	1.7
@@ -1 +1 @@
-20934b1950297f79b95f36c089ef037f  prboom-2.4.4.tar.gz
+24381017240a9eda5da21af0ca046228  prboom-2.4.5.tar.gz


--- prboom-2.4.1-gamedir.patch DELETED ---