rpms/quake3/devel .cvsignore, 1.2, 1.3 quake3-1.34-no-pak0-check.patch, 1.1, 1.2 quake3-1.34-rc4-demo-pak.patch, 1.2, 1.3 quake3-1.34-syslibs.patch, 1.2, 1.3 quake3.spec, 1.9, 1.10 sources, 1.2, 1.3 quake3-1.34-configurable-client-masterserver.patch, 1.1, NONE

Hans de Goede jwrdegoede at fedoraproject.org
Mon Apr 27 13:04:37 UTC 2009 

Author: jwrdegoede

Update of /cvs/extras/rpms/quake3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5643

Modified Files:
	.cvsignore quake3-1.34-no-pak0-check.patch 
	quake3-1.34-rc4-demo-pak.patch quake3-1.34-syslibs.patch 
	quake3.spec sources 
Removed Files:
	quake3-1.34-configurable-client-masterserver.patch 
Log Message:
* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 1.36-1
- New upstream release 1.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2007 08:04:58 -0000	1.2
+++ .cvsignore	27 Apr 2009 13:04:06 -0000	1.3
@@ -1 +1 @@
-quake3-1.34-rc4.tar.bz2
+quake3-1.36.tar.bz2

quake3-1.34-no-pak0-check.patch:

Index: quake3-1.34-no-pak0-check.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-no-pak0-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake3-1.34-no-pak0-check.patch	11 Jan 2008 16:26:10 -0000	1.1
+++ quake3-1.34-no-pak0-check.patch	27 Apr 2009 13:04:07 -0000	1.2
@@ -1,6 +1,7 @@
---- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-11 17:11:00.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-11 17:11:00.000000000 +0100
-@@ -2903,6 +2903,13 @@ static void FS_CheckPak0( void )
+diff -up quake3-1.36/code/qcommon/files.c.orig quake3-1.36/code/qcommon/files.c
+--- quake3-1.36/code/qcommon/files.c.orig	2009-04-27 09:39:11.000000000 +0200
++++ quake3-1.36/code/qcommon/files.c	2009-04-27 09:41:12.000000000 +0200
+@@ -2859,6 +2859,13 @@ static void FS_CheckPak0( void )
  	searchpath_t	*path;
  	qboolean founddemo = qfalse;
  	unsigned foundPak = 0;
@@ -12,5 +13,5 @@
 +			!strcmp(fs_gamedirvar->string, "wop"))
 +		return;
  
- 	for( path = fs_searchpaths; path; path = path->next ) {
- 		const char* pakBasename = path->pack->pakBasename;
+ 	for( path = fs_searchpaths; path; path = path->next )
+ 	{

quake3-1.34-rc4-demo-pak.patch:

Index: quake3-1.34-rc4-demo-pak.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-rc4-demo-pak.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quake3-1.34-rc4-demo-pak.patch	27 Jan 2009 09:24:35 -0000	1.2
+++ quake3-1.34-rc4-demo-pak.patch	27 Apr 2009 13:04:07 -0000	1.3
@@ -1,17 +1,18 @@
-diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
---- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
-+++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
-@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
+--- quake3-1.36/code/qcommon/files.c.orig	2009-04-27 09:43:28.000000000 +0200
++++ quake3-1.36/code/qcommon/files.c	2009-04-27 09:44:48.000000000 +0200
+@@ -2874,20 +2874,17 @@ static void FS_CheckPak0( void )
  		if(!path->pack)
  			continue;
  
 -		if(!Q_stricmpn( path->pack->pakGamename, "demoq3", MAX_OSPATH )
--		&& !Q_stricmpn( pakBasename, "pak0", MAX_OSPATH )) {
+-		   && !Q_stricmpn( pakBasename, "pak0", MAX_OSPATH ))
 +		if(!Q_stricmpn( pakBasename, "pak0", MAX_OSPATH ) &&
-+		   path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
++		   path->pack->checksum == DEMO_PAK0_CHECKSUM )
+ 		{
  			founddemo = qtrue;
  
--			if( path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
+-			if( path->pack->checksum == DEMO_PAK0_CHECKSUM )
+-			{
  				Com_Printf( "\n\n"
  						"**************************************************\n"
  						"WARNING: It looks like you're using pak0.pk3\n"
@@ -19,6 +20,6 @@
  						"guaranteed or supported.\n"
  						"**************************************************\n\n\n" );
 -			}
- 		} else if(!Q_stricmpn( path->pack->pakGamename, BASEGAME, MAX_OSPATH )
- 		&& strlen(pakBasename) == 4 && !Q_stricmpn( pakBasename, "pak", 3 )
- 		&& pakBasename[3] >= '0' && pakBasename[3] <= '8') {
+ 		}
+ 
+ 		else if(!Q_stricmpn( path->pack->pakGamename, BASEGAME, MAX_OSPATH )

quake3-1.34-syslibs.patch:

Index: quake3-1.34-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3-1.34-syslibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quake3-1.34-syslibs.patch	27 Jan 2009 09:24:35 -0000	1.2
+++ quake3-1.34-syslibs.patch	27 Apr 2009 13:04:07 -0000	1.3
@@ -1,65 +1,68 @@
-diff -up quake3-1.34-rc4/Makefile.syslibs quake3-1.34-rc4/Makefile
---- quake3-1.34-rc4/Makefile.syslibs	2007-09-26 16:29:52.000000000 +0200
-+++ quake3-1.34-rc4/Makefile	2009-01-27 09:55:12.000000000 +0100
-@@ -96,6 +96,10 @@ ifndef USE_OPENAL
- USE_OPENAL=1
+diff -up quake3-1.36/Makefile.syslibs quake3-1.36/Makefile
+--- quake3-1.36/Makefile.syslibs	2009-04-27 08:42:39.000000000 +0200
++++ quake3-1.36/Makefile	2009-04-27 09:19:52.000000000 +0200
+@@ -103,6 +103,10 @@ ifndef GENERATE_DEPENDENCIES
+ GENERATE_DEPENDENCIES=1
  endif
  
 +ifndef USE_SYSTEM_JPEG
 +USE_SYSTEM_JPEG=1
 +endif
 +
- ifndef USE_OPENAL_DLOPEN
- USE_OPENAL_DLOPEN=0
+ ifndef USE_OPENAL
+ USE_OPENAL=1
  endif
-@@ -180,7 +184,7 @@ ifeq ($(PLATFORM),linux)
+@@ -237,8 +241,11 @@ ifeq ($(PLATFORM),linux)
    endif
    endif
  
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = 
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+-    -pipe -DUSE_ICON $(shell sdl-config --cflags)
++  BASE_CFLAGS = -DUSE_ICON $(shell sdl-config --cflags)
++
++  ifeq ($(USE_SYSTEM_JPEG),1)
++    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++  endif
  
    ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -200,6 +204,10 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
-   endif
+     BASE_CFLAGS += -DUSE_OPENAL
+@@ -301,6 +308,10 @@ ifeq ($(PLATFORM),linux)
+ 
+   CLIENT_LIBS=$(shell sdl-config --libs) -lGL
  
 +  ifeq ($(USE_SYSTEM_JPEG),1)
-+    BASE_CFLAGS += -DUSE_SYSTEM_JPEG=1
++    CLIENT_LIBS += -ljpeg
 +  endif
 +
-   ifeq ($(USE_SDL),1)
-     BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
+   ifeq ($(USE_OPENAL),1)
+     ifneq ($(USE_OPENAL_DLOPEN),1)
+       CLIENT_LIBS += -lopenal
+@@ -844,7 +844,7 @@ ifeq ($(USE_VOIP),1)
+   ifeq ($(USE_INTERNAL_SPEEX),1)
+     BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
    else
-@@ -265,6 +273,10 @@ ifeq ($(PLATFORM),linux)
-     CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg
+-    CLIENT_LIBS += -lspeex
++    CLIENT_LIBS += -lspeex -lspeexdsp
    endif
+ endif
  
-+  ifeq ($(USE_SYSTEM_JPEG),1)
-+    CLIENT_LDFLAGS += -ljpeg
-+  endif
-+
-   ifeq ($(ARCH),i386)
-     # linux32 make ...
-     BASE_CFLAGS += -m32
-@@ -970,40 +982,7 @@ Q3OBJ = \
+@@ -1297,41 +1308,7 @@ Q3OBJ = \
    $(B)/client/l_script.o \
    $(B)/client/l_struct.o \
    \
 -  $(B)/client/jcapimin.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
+-  $(B)/client/jcapistd.o \
 -  $(B)/client/jccoefct.o  \
 -  $(B)/client/jccolor.o \
--  $(B)/client/jfdctflt.o \
 -  $(B)/client/jcdctmgr.o \
--  $(B)/client/jcphuff.o \
+-  $(B)/client/jchuff.o   \
+-  $(B)/client/jcinit.o \
 -  $(B)/client/jcmainct.o \
 -  $(B)/client/jcmarker.o \
 -  $(B)/client/jcmaster.o \
 -  $(B)/client/jcomapi.o \
 -  $(B)/client/jcparam.o \
+-  $(B)/client/jcphuff.o \
 -  $(B)/client/jcprepct.o \
 -  $(B)/client/jcsample.o \
 -  $(B)/client/jdapimin.o \
@@ -77,6 +80,7 @@
 -  $(B)/client/jdsample.o \
 -  $(B)/client/jdtrans.o \
 -  $(B)/client/jerror.o \
+-  $(B)/client/jfdctflt.o \
 -  $(B)/client/jidctflt.o \
 -  $(B)/client/jmemmgr.o \
    $(B)/client/jmemnobs.o \
@@ -84,28 +88,25 @@
    \
    $(B)/client/tr_animation.o \
    $(B)/client/tr_backend.o \
-@@ -1027,7 +1006,46 @@ Q3OBJ = \
-   $(B)/client/tr_shadows.o \
-   $(B)/client/tr_sky.o \
-   $(B)/client/tr_surface.o \
--  $(B)/client/tr_world.o \
-+  $(B)/client/tr_world.o
-+
+@@ -1370,6 +1347,46 @@ Q3OBJ = \
+   $(B)/client/con_log.o \
+   $(B)/client/sys_main.o
+ 
 +ifneq ($(USE_SYSTEM_JPEG),1)
 +  Q3OBJ += \
 +    $(B)/client/jcapimin.o \
-+    $(B)/client/jchuff.o   \
-+    $(B)/client/jcinit.o \
++    $(B)/client/jcapistd.o \
 +    $(B)/client/jccoefct.o  \
 +    $(B)/client/jccolor.o \
-+    $(B)/client/jfdctflt.o \
 +    $(B)/client/jcdctmgr.o \
-+    $(B)/client/jcphuff.o \
++    $(B)/client/jchuff.o   \
++    $(B)/client/jcinit.o \
 +    $(B)/client/jcmainct.o \
 +    $(B)/client/jcmarker.o \
 +    $(B)/client/jcmaster.o \
 +    $(B)/client/jcomapi.o \
 +    $(B)/client/jcparam.o \
++    $(B)/client/jcphuff.o \
 +    $(B)/client/jcprepct.o \
 +    $(B)/client/jcsample.o \
 +    $(B)/client/jdapimin.o \
@@ -123,19 +124,21 @@
 +    $(B)/client/jdsample.o \
 +    $(B)/client/jdtrans.o \
 +    $(B)/client/jerror.o \
++    $(B)/client/jfdctflt.o \
 +    $(B)/client/jidctflt.o \
 +    $(B)/client/jmemmgr.o \
 +    $(B)/client/jutils.o
 +else
-+Q3OBJ += $(B)/client/jpeg_memsrc.o
++  Q3OBJ += $(B)/client/jpeg_memsrc.o
 +endif
- 
++
  ifeq ($(ARCH),i386)
    Q3OBJ += \
-diff -up quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs quake3-1.34-rc4/code/jpeg-6/jmemnobs.c
---- quake3-1.34-rc4/code/jpeg-6/jmemnobs.c.syslibs	2007-09-26 16:29:40.000000000 +0200
-+++ quake3-1.34-rc4/code/jpeg-6/jmemnobs.c	2009-01-27 09:55:12.000000000 +0100
-@@ -17,10 +17,23 @@
+     $(B)/client/snd_mixa.o \
+diff -up quake3-1.36/code/jpeg-6b/jmemnobs.c.syslibs quake3-1.36/code/jpeg-6b/jmemnobs.c
+--- quake3-1.36/code/jpeg-6b/jmemnobs.c.syslibs	2009-04-27 08:42:28.000000000 +0200
++++ quake3-1.36/code/jpeg-6b/jmemnobs.c	2009-04-27 08:52:42.000000000 +0200
+@@ -17,11 +17,26 @@
  
  #include "../renderer/tr_local.h"
  
@@ -145,21 +148,24 @@
 +#include <jpeglib.h>
 +
 +#undef GLOBAL
-+#define GLOBAL
++#define GLOBAL(x) x
 +#define FAR
 +
 +typedef void * backing_store_ptr;
 +
 +#else
++
  #define JPEG_INTERNALS
  #include "jinclude.h"
  #include "jpeglib.h"
  #include "jmemsys.h"		/* import the system-dependent declarations */
-+#endif
  
++#endif
++
  /*
-  * Memory allocation and ri.Freeing are controlled by the regular library
-@@ -83,7 +96,13 @@ GLOBAL void
+  * Memory allocation and freeing are controlled by the regular library
+  * routines ri.Malloc() and ri.Free().
+@@ -83,7 +98,13 @@ GLOBAL(void)
  jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
  			 long total_bytes_needed)
  {
@@ -173,9 +179,9 @@
  }
  
  
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.c
---- /dev/null	2009-01-27 08:51:13.290004978 +0100
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.c	2009-01-27 09:55:12.000000000 +0100
+diff -up /dev/null quake3-1.36/code/renderer/jpeg_memsrc.c
+--- /dev/null	2009-04-27 08:18:28.430258242 +0200
++++ quake3-1.36/code/renderer/jpeg_memsrc.c	2009-04-27 08:51:16.000000000 +0200
 @@ -0,0 +1,163 @@
 +/*
 +* memsrc.c
@@ -218,7 +224,7 @@
 +METHODDEF(void)
 +init_source (j_decompress_ptr cinfo)
 +{
-+/* No work, since jpeg_memory_src set up the buffer pointer and count.
++/* No work, since jpeg_mem_src set up the buffer pointer and count.
 +* Indeed, if we want to read multiple JPEG images from one buffer,
 +* this *must* not do anything to the pointer.
 +*/
@@ -314,12 +320,12 @@
 +*/
 +
 +GLOBAL(void)
-+jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
++jpeg_mem_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
 +{
 +my_src_ptr src;
 +
 +/* The source object is made permanent so that a series of JPEG images
-+* can be read from a single buffer by calling jpeg_memory_src
++* can be read from a single buffer by calling jpeg_mem_src
 +* only before the first one.
 +* This makes it unsafe to use this manager and a different source
 +* manager serially with the same JPEG object. Caveat programmer.
@@ -340,19 +346,20 @@
 +src->pub.next_input_byte = buffer;
 +src->pub.bytes_in_buffer = bufsize;
 +}
-diff -up /dev/null quake3-1.34-rc4/code/renderer/jpeg_memsrc.h
---- /dev/null	2009-01-27 08:51:13.290004978 +0100
-+++ quake3-1.34-rc4/code/renderer/jpeg_memsrc.h	2009-01-27 09:55:12.000000000 +0100
+diff -up /dev/null quake3-1.36/code/renderer/jpeg_memsrc.h
+--- /dev/null	2009-04-27 08:18:28.430258242 +0200
++++ quake3-1.36/code/renderer/jpeg_memsrc.h	2009-04-27 08:51:16.000000000 +0200
 @@ -0,0 +1,5 @@
 +#include <stdio.h>
 +#include <jpeglib.h>
 +
-+void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer,
++void jpeg_mem_src (j_decompress_ptr cinfo, const JOCTET * buffer,
 +  size_t bufsize);
-diff -up quake3-1.34-rc4/code/renderer/tr_image.c.syslibs quake3-1.34-rc4/code/renderer/tr_image.c
---- quake3-1.34-rc4/code/renderer/tr_image.c.syslibs	2007-09-26 16:29:48.000000000 +0200
-+++ quake3-1.34-rc4/code/renderer/tr_image.c	2009-01-27 09:55:12.000000000 +0100
-@@ -30,9 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
+diff -up quake3-1.36/code/renderer/tr_image.c.syslibs quake3-1.36/code/renderer/tr_image.c
+diff -up quake3-1.36/code/renderer/tr_image_jpg.c.syslibs quake3-1.36/code/renderer/tr_image_jpg.c
+--- quake3-1.36/code/renderer/tr_image_jpg.c.syslibs	2009-04-27 08:42:30.000000000 +0200
++++ quake3-1.36/code/renderer/tr_image_jpg.c	2009-04-27 08:59:40.000000000 +0200
+@@ -30,8 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth 
   * You may also wish to include "jerror.h".
   */
  
@@ -361,17 +368,15 @@
 +#include "jpeg_memsrc.h"
 +#else
  #define JPEG_INTERNALS
- #include "../jpeg-6/jpeglib.h"
--
+ #include "../jpeg-6b/jpeglib.h"
 +#endif
  
- static void LoadBMP( const char *name, byte **pic, int *width, int *height );
- static void LoadTGA( const char *name, byte **pic, int *width, int *height );
-@@ -1405,6 +1409,11 @@ static void LoadJPG( const char *filenam
-   unsigned char *out;
-   byte	*fbuffer;
+ void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
+   /* This struct contains the JPEG decompression parameters and pointers to
+@@ -62,6 +67,10 @@ void R_LoadJPG( const char *filename, un
+ 		void *v;
+ 	} fbuffer;
    byte  *buf;
-+  size_t bufsize;
 +#ifdef USE_SYSTEM_JPEG
 +  int i,j;
 +  byte *inptr, *outptr;
@@ -379,29 +384,7 @@
  
    /* In this example we want to open the input file before doing anything else,
     * so that the setjmp() error recovery below can assume the file is open.
-@@ -1412,7 +1421,7 @@ static void LoadJPG( const char *filenam
-    * requires it in order to read binary files.
-    */
- 
--  ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-+  bufsize = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-   if (!fbuffer) {
- 	return;
-   }
-@@ -1430,8 +1439,11 @@ static void LoadJPG( const char *filenam
-   jpeg_create_decompress(&cinfo);
- 
-   /* Step 2: specify data source (eg, a file) */
--
-+#ifdef USE_SYSTEM_JPEG
-+  jpeg_memory_src(&cinfo, fbuffer, bufsize);
-+#else /* ???????? */
-   jpeg_stdio_src(&cinfo, fbuffer);
-+#endif
- 
-   /* Step 3: read file parameters with jpeg_read_header() */
- 
-@@ -1474,7 +1486,7 @@ static void LoadJPG( const char *filenam
+@@ -131,7 +143,7 @@ void R_LoadJPG( const char *filename, un
    }
  
    memcount = pixelcount * 4;
@@ -410,7 +393,7 @@
  
    out = ri.Malloc(memcount);
  
-@@ -1495,6 +1507,21 @@ static void LoadJPG( const char *filenam
+@@ -152,6 +164,21 @@ void R_LoadJPG( const char *filename, un
  	buf = ((out+(row_stride*cinfo.output_scanline)));
  	buffer = &buf;
      (void) jpeg_read_scanlines(&cinfo, buffer, 1);
@@ -432,21 +415,3 @@
    }
    
    buf = out;
-@@ -1614,6 +1641,8 @@ boolean empty_output_buffer (j_compress_
- }
- 
- 
-+#ifndef USE_SYSTEM_JPEG
-+
- /*
-  * Compression initialization.
-  * Before calling this, all parameters and a data destination must be set up.
-@@ -1705,6 +1734,8 @@ jpeg_write_scanlines (j_compress_ptr cin
-   return row_ctr;
- }
- 
-+#endif
-+
- /*
-  * Terminate destination --- called by jpeg_finish_compress
-  * after all data has been written.  Usually needs to flush buffer.


Index: quake3.spec
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/quake3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quake3.spec	25 Feb 2009 18:19:15 -0000	1.9
+++ quake3.spec	27 Apr 2009 13:04:07 -0000	1.10
@@ -1,22 +1,20 @@
-%define prever rc4
-
 Name:           quake3
-Version:        1.34
-Release:        0.11.%{prever}%{?dist}
+Version:        1.36
+Release:        1%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://ioquake3.org/
 # to regenerate (note included systemlib copies are removed for size, lcc
 # is removed as it is not Free software):
-# svn co svn://svn.icculus.org/quake3/tags/%{version}-%{prever} %{name}-%{version}-%{prever}
-# pushd %{name}-%{version}-%{prever}
+# svn co svn://svn.icculus.org/quake3/tags/%{version} %{name}-%{version}
+# pushd %{name}-%{version}
 # rm -fr `find -name .svn` code/AL code/SDL12 code/libcurl code/libs
-# mv code/jpeg-6/jmemnobs.c .; rm code/jpeg-6/*; mv jmemnobs.c code/jpeg-6
+# mv code/jpeg-6b/jmemnobs.c .; rm code/jpeg-6b/*; mv jmemnobs.c code/jpeg-6b
 # rm -fr code/tools/lcc
 # popd
-# tar cvfj %{name}-%{version}-%{prever}.tar.bz2 %{name}-%{version}-%{prever}
-Source0:        %{name}-%{version}-%{prever}.tar.bz2
+# tar cvfj %{name}-%{version}.tar.bz2 %{name}-%{version}
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-demo.sh
 Source2:        %{name}.autodlrc
 Source3:        %{name}.desktop
@@ -32,13 +30,12 @@
 Source13:       worldofpadman.desktop
 Source14:       wop.png
 Patch0:         quake3-1.34-syslibs.patch
-Patch1:         quake3-1.34-configurable-client-masterserver.patch
 Patch2:         quake3-1.34-fix-empty-fs_game-from-server.patch
 Patch3:         quake3-1.34-dont-ask-openarena-cdkey.patch
 Patch4:         quake3-1.34-no-pak0-check.patch
 Patch5:         quake3-1.34-rc4-demo-pak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
+BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel speex-devel
 BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
 %ifarch %{ix86} x86_64
 BuildRequires:  nasm
@@ -132,9 +129,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{prever}
+%setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -145,10 +141,10 @@
 # the CROSS_COMPILING=1 is a hack to not build q3cc and qvm files
 # since we've stripped out q3cc as this is not Free Software.
 make %{?_smp_mflags} \
-    OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing -ffast-math" \
+    OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing" \
     DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
     USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
-    CROSS_COMPILING=1
+    USE_INTERNAL_SPEEX=0 BUILD_CLIENT_SMP=1 CROSS_COMPILING=1 
 
 
 %install
@@ -240,7 +236,7 @@
 %files
 %defattr(-,root,root,-)
 %doc BUGS ChangeLog COPYING.txt id-readme.txt md4-readme.txt NOTTODO README
-%doc TODO code/jpeg-6/README
+%doc TODO
 %{_bindir}/%{name}
 %{_bindir}/%{name}-smp
 %{_bindir}/%{name}-update
@@ -271,6 +267,9 @@
 
 
 %changelog
+* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 1.36-1
+- New upstream release 1.36
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-0.11.rc4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quake3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2007 08:04:58 -0000	1.2
+++ sources	27 Apr 2009 13:04:07 -0000	1.3
@@ -1 +1 @@
-14d75cb93a77423fdc6f77c40ddfa12f  quake3-1.34-rc4.tar.bz2
+a5c41f756ed4c68b45ad25f496cee318  quake3-1.36.tar.bz2


--- quake3-1.34-configurable-client-masterserver.patch DELETED ---

More information about the fedora-extras-commits mailing list