rpms/prboom/FC-4 prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 prboom.spec, 1.2, 1.3 sources, 1.2, 1.3 prboom-2.3.1-64bit.patch, 1.1, NONE prboom-2.3.1-config.patch, 1.1, NONE prboom-2.3.1-fixpsnprintf.patch, 1.1, NONE prboom-2.3.1-gamedir.patch, 1.1, NONE prboom-2.3.1-gcc4.patch, 1.2, NONE

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602/FC-4

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prboom.spec	19 Mar 2006 07:02:25 -0000	1.2
+++ prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
@@ -1,19 +1,15 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -30,13 +26,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +61,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---