Author: sparky Date: Sat Oct 15 13:23:44 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - icculus version now on HEAD, old branched as BINARY
---- Files affected: SPECS: quake3.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/quake3.spec diff -u SPECS/quake3.spec:1.32 SPECS/quake3.spec:1.33 --- SPECS/quake3.spec:1.32 Wed Jun 1 04:22:27 2005 +++ SPECS/quake3.spec Sat Oct 15 15:23:38 2005 @@ -1,41 +1,34 @@ # $Revision$, $Date$ +%define _dataver 1.32b-3 Summary: Quake3 for Linux Summary(pl): Quake3 dla Linuksa Name: quake3 -Version: 1.32b -%define _subver 3 -Release: 6 -Vendor: id Software -License: Q3A EULA, PB EULA +Version: 1.33 +Release: 0.5 +License: GPL Group: Applications/Games -Source0: ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-%{version}-%{_subver}.x86.run -# Source0-md5: c71fdddccb20e8fc393d846e9c61d685 -Source1: q3ded.init -Source2: q3ded.sysconfig -Source3: %{name}.png -Source4: %{name}.desktop -Source5: %{name}-smp.desktop -URL: http://www.idsoftware.com/ +Source0: %{name}-%{version}_SVN156M.tar.bz2 +# Source0-md5: 62430cc4fd6963a7ba53da6de7fa5582 +Source1: ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-%{_dataver}.x86.run +# Source1-md5: c71fdddccb20e8fc393d846e9c61d685 +Source2: q3ded.init +Source3: q3ded.sysconfig +Source4: %{name}.png +Source5: %{name}.desktop +Source6: %{name}-smp.desktop +Patch0: %{name}-gpl-Makefile-install.patch +URL: http://icculus.org/quake3/ +BuildRequires: SDL-devel +BuildRequires: byacc BuildRequires: rpmbuild(macros) >= 1.202 -Requires(pre): /bin/id -Requires(pre): /usr/bin/getgid -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} Requires: OpenGL Requires: psmisc -Provides: group(quake3) -Provides: user(quake3) -ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define no_install_post_strip 1 - +%define specflags -ffast-math -funroll-loops -fomit-frame-pointer -fno-strict-aliasing +%define specflags_ia32 -falign-loops=2 -falign-jumps=2 -falign-functions=2 %define _noautoreqdep libGL.so.1 libGLU.so.1 -%define _gamedir /opt/quake3 %description Quake 3 for Linux. @@ -47,10 +40,18 @@ Summary: Quake3 server Summary(pl): Serwer Quake3 Group: Applications/Games -PreReq: rc-scripts +Requires: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} Requires: screen +Provides: group(quake3) +Provides: user(quake3) %description server Quake3 server. @@ -73,6 +74,7 @@ %package common Summary: Common files for quake3 Summary(pl): Pliki wspólne dla quake3 +License: Q3A EULA, PB EULA Group: Applications/Games Obsoletes: quake3-single @@ -83,54 +85,63 @@ Pliki wspólne quake3 dla serwera i trybu gracza. %prep -%setup -qcT -sh %{SOURCE0} --tar xf +%setup -q -n %{name}-%{version}_SVN156M +mkdir data +sh %{SOURCE1} --tar xfC data +%patch0 -p1 + +%build +CFLAGS="%{rpmcflags}" +CFLAGS="$CFLAGS -DDEFAULT_BASEDIR=\\\"%{_datadir}/%{name}\\\"" +CFLAGS="$CFLAGS -Wall -Wimplicit -Wstrict-prototypes" +CFLAGS="$CFLAGS -DUSE_SDL=1 $(sdl-config --cflags)" +CFLAGS="$CFLAGS -DNDEBUG -MMD" +CFLAGS="$CFLAGS -DHAVE_VM_NATIVE" +%ifarch %{ix86} +CFLAGS="$CFLAGS -DHAVE_VM_COMPILED" +%endif + +%{__make} -C code/unix makedirs targets \ + B="release-%{_target}" \ + CC="%{__cc}" \ + CFLAGS="$CFLAGS" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \ - $RPM_BUILD_ROOT{%{_gamedir}/{baseq3,pb/{,htm}},%{_bindir}} \ - $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} - -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/q3ded -install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/q3ded -install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir} -install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop -install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-smp.desktop -install baseq3/* $RPM_BUILD_ROOT%{_gamedir}/baseq3 -install bin/Linux/x86/* $RPM_BUILD_ROOT%{_gamedir} -install pb/*.so $RPM_BUILD_ROOT%{_gamedir}/pb -install pb/htm/*.htm $RPM_BUILD_ROOT%{_gamedir}/pb/htm - -cat << EOF > $RPM_BUILD_ROOT%{_bindir}/quake3 -#!/bin/sh -cd %{_gamedir} -./quake3.x86 -EOF -cat << EOF > $RPM_BUILD_ROOT%{_bindir}/quake3-smp -#!/bin/sh -cd %{_gamedir} -./quake3-smp.x86 -EOF - -# make check files happy -rm -f $RPM_BUILD_ROOT%{_gamedir}/quake3{,-smp} + $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/baseq3} \ + $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ + $RPM_BUILD_ROOT/home/services/quake3 + +%{__make} -C code/unix install \ + BR="release-%{_target}" \ + BINDIR=$RPM_BUILD_ROOT%{_bindir} \ + DATADIR=$RPM_BUILD_ROOT%{_datadir}/%{name} \ + LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} + +install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/q3ded +install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/q3ded +install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir} +install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/quake3.desktop +install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/quake3-smp.desktop +install data/baseq3/pak?.pk3 $RPM_BUILD_ROOT%{_datadir}/%{name}/baseq3 %clean rm -rf $RPM_BUILD_ROOT -%pre common -%groupadd -P %{name}-common -g 38 quake3 -%useradd -P %{name}-common -u 124 -d %{_gamedir} -s /bin/bash -c "Quake ]|[ Arena" -g quake3 quake3 - %post common if [ "$1" = "1" ]; then echo "" - echo "You need to copy pak0.pk3 from your Quake3 CD into %{_gamedir}/baseq3/." + echo "You need to copy pak0.pk3 from your Quake3 CD into %{_datadir}/%{name}/baseq3/." echo "Or if you have got a Windows installation of Q3 make a symlink to save space." + echo "You may place it in ~/.q3a/baseq3/ but you will have to put all pak files there (or make symlinks)." echo "" fi +%pre server +%groupadd -P %{name}-common -g 38 quake3 +%useradd -P %{name}-common -u 124 -d /home/services/quake3 -s /bin/bash -c "Quake ]|[ Arena" -g quake3 quake3 + %post server /sbin/chkconfig --add q3ded if [ -f /var/lock/subsys/q3ded ]; then @@ -147,39 +158,37 @@ /sbin/chkconfig --del q3ded fi -%postun common +%postun server if [ "$1" = "0" ]; then - %userremove quake3 - %groupremove quake3 + %userremove quake3 + %groupremove quake3 fi %files %defattr(644,root,root,755) -%attr(755,root,root) %{_gamedir}/quake3.x86 %attr(755,root,root) %{_bindir}/quake3 %{_desktopdir}/quake3.desktop %files common %defattr(644,root,root,755) -%doc Q3A_EULA.txt README-linux.txt pb/PB_EULA.txt -%dir %{_gamedir} -%{_gamedir}/baseq3 -%dir %{_gamedir}/pb -%{_gamedir}/pb/htm -%attr(755,root,root) %{_gamedir}/pb/*.so +%doc id-readme.txt i_o-q3-readme data/Q3A_EULA.txt data/README-linux.txt data/pb/PB_EULA.txt +%{_datadir}/%{name} %{_pixmapsdir}/quake3.png %files server %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/q3ded %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/q3ded -%attr(755,root,root) %{_gamedir}/q3ded +%attr(755,root,root) %{_bindir}/q3ded +%attr(750,quake3,quake3) /home/services/quake3 +%if 0 +# broken %files smp %defattr(644,root,root,755) -%attr(755,root,root) %{_gamedir}/quake3-smp.x86 %attr(755,root,root) %{_bindir}/quake3-smp %{_desktopdir}/quake3-smp.desktop +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -187,107 +196,68 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.32 2005/06/01 02:22:27 ankry -- no 64-bit version, rel. 6 - -Revision 1.31 2005/05/26 15:20:58 koorek -- rel up due to desktop file fixes - -Revision 1.30 2005/05/11 17:05:48 qboosh -- use x8664 macro - -Revision 1.29 2005/05/01 17:31:30 glen -- use %useradd/%groupadd macros - -Revision 1.28 2005/04/16 22:34:22 glen -- make check-files happy - -Revision 1.27 2005/04/16 22:31:07 glen -- one more - -Revision 1.26 2005/04/16 22:30:43 glen -- see no reason why files (especially binaries) should be owned by quake3 - -Revision 1.25 2005/04/04 06:11:12 paszczus -- adapterized - -Revision 1.24 2005/04/03 18:53:00 qboosh -- tabs - -Revision 1.23 2005/04/03 14:57:14 paszczus -- working on amd64 too - -Revision 1.22 2005/03/27 11:05:41 paszczus -- %%userremove/%%groupremove support -- added group(38) and user quake3(124) -- release 4 - -Revision 1.21 2004/08/06 18:18:04 qboosh -- no reason for non-standard binaries group - -Revision 1.20 2004/08/06 09:20:58 gotar -- chmod o+x binaries - games group isn't used that way in PLD - -Revision 1.19 2004/06/02 13:39:44 pluto -- O: += quake3-single. - -Revision 1.18 2004/06/01 21:06:44 andree -- change packages name (common package for common files) -- fix requires, rel.3 - -Revision 1.17 2004/05/13 19:58:51 andree -- fix post, preun; seems ok rel. 2 - -Revision 1.16 2004/05/11 13:10:59 andree -- split to single,smp,server -- added smp.desktop, rel. 1.9 - -Revision 1.15 2004/05/11 00:38:17 andree -- added quake3.png, quake3.desktop -- added TODO, rel. 2 - -Revision 1.14 2004/04/27 14:50:37 pluto -- license fixed. - -Revision 1.13 2004/04/27 14:33:41 pluto -- pbweb separated -- init script updated (thx. ankry) -- release 1 - -Revision 1.12 2004/03/22 22:55:38 qboosh -- cleanups, package quake3* scripts - -Revision 1.11 2004/03/22 18:01:53 djurban -- bleh, tylko smutasy w tym pld i do tego unrealowcy - -Revision 1.10 2004/03/22 17:04:05 djurban -- http://www.penny-arcade.com/images/1999/19991215l.jpg - -Revision 1.9 2004/03/22 16:25:55 wolf -- q3 sux - -Revision 1.8 2004/03/22 15:26:14 pluto -- nosource 1, runscripts, %%files. - -Revision 1.7 2004/03/22 13:19:15 pluto -- it seems to work. -- release 0.9. - -Revision 1.6 2004/03/22 11:27:41 pluto -- typos. - -Revision 1.5 2004/03/22 11:08:12 pluto -- init script, done. - -Revision 1.4 2004/03/22 00:43:13 pluto -- init script, NFY... - -Revision 1.3 2004/03/22 00:08:42 pluto -- pbweb added. -- release 0.2. - -Revision 1.2 2004/03/21 23:10:42 pluto -- md5, TODO. +Revision 1.33 2005/10/15 13:23:38 sparky +- icculus version now on HEAD, old branched as BINARY -Revision 1.1 2004/03/21 21:11:22 pluto -- initial release. +Revision 1.16 2005/10/15 13:00:53 sparky +- quake3 user/group fixing finished +- TODO: clean upgrade from binary q3: quake3 home dir has changed + +Revision 1.15 2005/10/15 10:36:21 paszczus +- Requires(post,preun,pre,postun) moved to -server package + +Revision 1.14 2005/10/15 09:30:00 paszczus +- using new q3ded-gpl.init with new home directory (/usr/share/quake3-gpl) + +Revision 1.13 2005/10/14 16:31:01 paszczus +- some docs added + +Revision 1.12 2005/10/14 16:10:01 paszczus +- backiong to root.root for q3ded file + +Revision 1.11 2005/10/14 13:28:02 paszczus +- chown quake3.quake3 for %{_bindir}/q3ded + +Revision 1.10 2005/10/14 13:23:59 paszczus +- restored user/group add/remove but only for -server +- cleanup +- release 0.4 + +Revision 1.9 2005/10/14 06:51:17 paszczus +- fixed build on ppc (is it right way?) + +Revision 1.8 2005/10/14 02:44:39 sparky +- many fixes, probably some bug introduced too: +- extract files from linuxq3apoint +- license of common is Q3A EULA, PB EULA +- commented out quake user/group stuff, what was it for ? +- use bindir/datadir and not gamedir +- -DDEFAULT_BASEDIR=\"%{_datadir}/%{name}\" fixes pak*.pk3 placement search +- -smp if broken for now +- TODO: check ppc/sparc; there is no alpha support; (re)add doc files; cleanups + +Revision 1.7 2005/10/13 22:40:41 paszczus +- added BR: SDL-devel + +Revision 1.6 2005/10/13 22:25:21 paszczus +- little cleanup +- changed _gamedir from /opt/quake3 to /usr/share/quake3 + +Revision 1.5 2005/10/13 22:11:50 paszczus +- missing files +- removed/commented some files + +Revision 1.4 2005/10/13 22:06:23 paszczus +- used %{__make} copyfiles in %install +- added BR: sed >= 4.0 cause changed COPYFILES directory + +Revision 1.3 2005/10/13 21:38:44 paszczus +- typo + +Revision 1.2 2005/10/13 21:37:50 paszczus +- added BR: byacc + +Revision 1.1 2005/10/13 21:36:29 paszczus +- initial spec file based on quake3.spec +- this is GPL version of great game Quake3 +- NFY ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/quake3.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
