packages: duke3d/duke3d-opt.patch, duke3d/duke3d.spec - up to svn r187

[glen]

Author: glen                         Date: Sat Sep  5 11:13:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to svn r187

---- Files affected:
packages/duke3d:
   duke3d-opt.patch (1.1 -> 1.2) , duke3d.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/duke3d/duke3d-opt.patch
diff -u packages/duke3d/duke3d-opt.patch:1.1 packages/duke3d/duke3d-opt.patch:1.2
--- packages/duke3d/duke3d-opt.patch:1.1	Tue Sep  9 20:33:49 2003
+++ packages/duke3d/duke3d-opt.patch	Sat Sep  5 13:13:35 2009
@@ -1,22 +1,11 @@
-diff -urN duke3d.orig/source/Makefile duke3d/source/Makefile
---- duke3d.orig/source/Makefile	2003-06-23 12:59:13.000000000 +0200
-+++ duke3d/source/Makefile	2003-09-09 20:29:02.000000000 +0200
-@@ -87,8 +87,7 @@
+--- duke3d/source/Makefile~	2009-09-05 14:02:23.000000000 +0300
++++ duke3d/source/Makefile	2009-09-05 14:03:38.372933611 +0300
+@@ -114,7 +114,7 @@
+ 	BUILDOBJS += buildengine/a.o
  endif
  
- CC = gcc
--CFLAGS = -c -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
--OPTIMIZE = -O2
-+CFLAGS = -c $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -W -Wall -Wno-unused $(EXTRACFLAGS) -funsigned-char
+-CFLAGS = -c -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 $(EXTRACFLAGS)
++CFLAGS = -c $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 $(EXTRACFLAGS)
  
- # Uncomment this to compile with the Intel compiler (v6.0)
- #CC = icc
-@@ -103,7 +102,7 @@
- 
- 
- %.o : %.c
--	$(CC) $(CFLAGS) $(OPTIMIZE) -o $@ $<
-+	$(CC) $(CFLAGS) -o $@ $<
- 
- # Animation playback crashes due to optimization error on MacOS X. --ryan.
- ifeq ($(strip $(macosx)),true)
+ ifeq ($(strip $(solaris)),true)
+ 	CFLAGS += -xO5 -xchar=u

================================================================
Index: packages/duke3d/duke3d.spec
diff -u packages/duke3d/duke3d.spec:1.11 packages/duke3d/duke3d.spec:1.12
--- packages/duke3d/duke3d.spec:1.11	Sat Apr  7 19:36:23 2007
+++ packages/duke3d/duke3d.spec	Sat Sep  5 13:13:35 2009
@@ -1,16 +1,19 @@
 # $Revision$, $Date$
+%define		ver 	032696
+%define		rel		0.1
 Summary:	Duke Nukem 3D
 Summary(pl.UTF-8):	Duke Nukem 3D
 Name:		duke3d
 Version:	1.5
-Release:	2
+Release:	0.%{ver}.%{rel}
 License:	GPL
 Group:		X11/Applications/Games
-Source0:	%{name}-20030928.tar.bz2
-# Source0-md5:	35fe7c0607b00f1750ca764cc513b972
+Source0:	%{name}.tar.bz2
+# Source0-md5:	1fce8602af6e3dcdfd63307993643e75
 Patch0:		%{name}-opt.patch
 URL:		http://icculus.org/duke3d/
 BuildRequires:	SDL_mixer-devel
+BuildRequires:	SDL-devel
 BuildRequires:	nasm
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,24 +32,29 @@
 %setup -q -n %{name}
 %patch0 -p1
 
+ver=$(awk -F'"' '/DUKE NUKEM BUILD/{a=$(NF-1); sub(/.*: V/, "", a); print a}' source/astub.c)
+if [ "$ver" != %{ver} ]; then
+	exit 1
+fi
+
 %build
 %{__make} -C source/buildengine \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} `sdl-config --cflags` -DUDP_NETWORKING=1 -DPLATFORM_UNIX -fno-omit-frame-pointer -funsigned-char"
+	OPTIMIZE="%{rpmcflags} -fno-omit-frame-pointer -funsigned-char"
 
-%{__make} \
+%{__make} -C source \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} `sdl-config --cflags` -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_EXECINFO=1 -funsigned-char -c"
+	OPTIMIZE="%{rpmcflags} -funsigned-char"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/duke3d}
 
 install source/duke3d $RPM_BUILD_ROOT%{_bindir}
-install testdata/defs.con $RPM_BUILD_ROOT%{_datadir}/duke3d/DEFS.CON
-install testdata/game.con $RPM_BUILD_ROOT%{_datadir}/duke3d/GAME.CON
-install testdata/user.con $RPM_BUILD_ROOT%{_datadir}/duke3d/USER.CON
-install testdata/lookup.dat $RPM_BUILD_ROOT%{_datadir}/duke3d/LOOKUP.DAT
+cp -a testdata/defs.con $RPM_BUILD_ROOT%{_datadir}/duke3d/DEFS.CON
+cp -a testdata/game.con $RPM_BUILD_ROOT%{_datadir}/duke3d/GAME.CON
+cp -a testdata/user.con $RPM_BUILD_ROOT%{_datadir}/duke3d/USER.CON
+cp -a testdata/lookup.dat $RPM_BUILD_ROOT%{_datadir}/duke3d/LOOKUP.DAT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +62,7 @@
 %files
 %defattr(644,root,root,755)
 %doc readme.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/duke3d
 %{_datadir}/duke3d
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -63,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/09/05 11:13:35  glen
+- up to svn r187
+
 Revision 1.11  2007/04/07 17:36:23  qboosh
 - unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/duke3d/duke3d-opt.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/duke3d/duke3d.spec?r1=1.11&r2=1.12&f=u