SPECS: quake3.spec - up to yesterdays snapshot (r518) - smp client...

[sparky]

Author: sparky                       Date: Tue Jan 24 00:24:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to yesterdays snapshot (r518)
- smp client is back !
- rel 0.1 for now, I have to test it

---- Files affected:
SPECS:
   quake3.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/quake3.spec
diff -u SPECS/quake3.spec:1.58 SPECS/quake3.spec:1.59
--- SPECS/quake3.spec:1.58	Fri Dec 23 17:09:59 2005
+++ SPECS/quake3.spec	Tue Jan 24 01:24:27 2006
@@ -9,12 +9,12 @@
 Summary(pl):	Quake3 dla Linuksa
 Name:		quake3
 Version:	1.33
-%define	_snap	20051221
-Release:	0.%{_snap}.1
+%define	_snap	20060122
+Release:	0.%{_snap}.0.1
 License:	GPL
 Group:		Applications/Games
 Source0:	http://sparky.homelinux.org/snaps/icculus/%{name}-%{_snap}.tar.bz2
-# Source0-md5:	034a93700d3feb207ad3cc7491f25d8c
+# Source0-md5:	61589f454bb31b002fcdddb8d4381981
 Source2:	q3ded.init
 Source3:	q3ded.sysconfig
 Source4:	%{name}.png
@@ -90,7 +90,6 @@
 Requires(triggerpostun):	/usr/sbin/groupdel
 Requires(triggerpostun):	/usr/sbin/userdel
 Requires:	quake3-data >= %{_dataver}-1
-Obsoletes:	%{name}-smp
 Obsoletes:	quake3-single
 
 %description common
@@ -103,6 +102,13 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+cat << EOF > Makefile.local
+BUILD_CLIENT     = 1
+BUILD_CLIENT_SMP = 1
+BUILD_SERVER     = 1
+BUILD_GAME_SO    = 1
+BUILD_GAME_QVM   = 0
+EOF
 
 %build
 CFLAGS="%{rpmcflags}"
@@ -111,7 +117,8 @@
 CFLAGS="$CFLAGS -Wall -Wimplicit -Wstrict-prototypes"
 CFLAGS="$CFLAGS -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 $(sdl-config --cflags)"
 %if %{with openal}
-CFLAGS="$CFLAGS -DUSE_OPENAL=1" # -DUSE_OPENAL_DLOPEN=1"
+CFLAGS="$CFLAGS -DUSE_OPENAL=1"
+# -DUSE_OPENAL_DLOPEN=1"
 %endif
 CFLAGS="$CFLAGS -DNDEBUG -MMD"
 %ifnarch %{ix86}
@@ -119,7 +126,7 @@
 CFLAGS="$CFLAGS -DNO_VM_COMPILED"
 %endif
 
-%{__make} -C code/unix makedirs targets	\
+%{__make} makedirs tools targets \
 	B="release-%{_target}"	\
 	CC="%{__cc}"		\
 	CFLAGS="$CFLAGS"
@@ -131,7 +138,7 @@
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT/var/games/quake3
 
-%{__make} -C code/unix install	\
+%{__make} install \
 	BR="release-%{_target}"	\
 	BINDIR=$RPM_BUILD_ROOT%{_bindir}		\
 	Q3LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -225,13 +232,10 @@
 %attr(755,root,root) %{_bindir}/q3ded
 %attr(750,quake3,quake3) /var/games/quake3
 
-%if 0
-# broken
 %files smp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/quake3-smp
 %{_desktopdir}/quake3-smp.desktop
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -239,6 +243,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/01/24 00:24:27  sparky
+- up to yesterdays snapshot (r518)
+- smp client is back !
+- rel 0.1 for now, I have to test it
+
 Revision 1.58  2005/12/23 16:09:59  sparky
 - updated to 20051221 (r446)
 - added openal bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quake3.spec?r1=1.58&r2=1.59&f=u