Author: sparky Date: Fri Nov 4 22:03:51 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separated data
- O: smp in common (for now)
- some info in trigger
- rel 1, stbr (ac-test at last); status: ix86, x8666, ppc works, other don't
but builds
---- Files affected:
SPECS:
quake3.spec (1.50 -> 1.51)
---- Diffs:
================================================================
Index: SPECS/quake3.spec
diff -u SPECS/quake3.spec:1.50 SPECS/quake3.spec:1.51
--- SPECS/quake3.spec:1.50 Fri Nov 4 20:55:22 2005
+++ SPECS/quake3.spec Fri Nov 4 23:03:46 2005
@@ -1,17 +1,15 @@
# $Revision$, $Date$
-%define _dataver 1.32b-3
+%define _dataver 1.32b3
Summary: Quake3 for Linux
Summary(pl): Quake3 dla Linuksa
Name: quake3
Version: 1.33
%define _snap 20051103
-Release: 0.%{_snap}.0.1
+Release: 0.%{_snap}.1
License: GPL
Group: Applications/Games
Source0:
http://sparky.homelinux.org/snaps/icculus/%{name}-%{_snap}.tar.bz2
# Source0-md5: db4168a93a253a795095c6a461bfd7e9
-Source1:
ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-%{_dataver}.x86.run
-# Source1-md5: c71fdddccb20e8fc393d846e9c61d685
Source2: q3ded.init
Source3: q3ded.sysconfig
Source4: %{name}.png
@@ -81,6 +79,8 @@
Group: Applications/Games
Requires(triggerpostun): /usr/sbin/groupdel
Requires(triggerpostun): /usr/sbin/userdel
+Requires: quake3-data >= %{_dataver}-1
+Obsoletes: %{name}-smp
Obsoletes: quake3-single
%description common
@@ -91,8 +91,6 @@
%prep
%setup -q -n %{name}
-mkdir data
-sh %{SOURCE1} --tar xfC data
%patch0 -p1
%patch1 -p1
@@ -130,7 +128,6 @@
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}/games/%{name}/baseq3
%clean
rm -rf $RPM_BUILD_ROOT
@@ -171,11 +168,21 @@
fi
%triggerpostun server -- %{name}-server < 1.33
+if [ -f /var/lock/subsys/q3ded ]; then
+ # server will fail because of lack of pak0.pk3
+ /etc/rc.d/init.d/q3ded stop 1>&2
+fi
if [ "`getent passwd quake3 | cut -d: -f6`" = "/opt/quake3" ]; then
/usr/sbin/usermod -d /var/games/quake3 -s /bin/sh quake3
fi
%triggerpostun common -- %{name}-common < 1.33
+if [ ! -f %{_datadir}/games/%{name}/baseq3/pak0.pk3 ]; then
+ # Better don't link/move automatically, /opt may be on other partition
than /usr
+ echo ""
+ echo "Quake 3 data location has changed, link or move pak0.pk3 to
%{_datadir}/games/%{name}/baseq3/."
+ echo ""
+fi
if [ "$1" = "0" ]; then
%userremove quake3
%groupremove quake3
@@ -189,9 +196,8 @@
%files common
%defattr(644,root,root,755)
%doc id-readme.txt i_o-q3-readme ChangeLog STATUS TODO
-%doc data/Q3A_EULA.txt data/README-linux.txt data/pb/PB_EULA.txt
%dir %{_datadir}/games/%{name}
-%{_datadir}/games/%{name}/*
+%dir %{_datadir}/games/%{name}/baseq3
%{_pixmapsdir}/quake3.png
%files server
@@ -215,6 +221,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.51 2005/11/04 22:03:46 sparky
+- separated data
+- O: smp in common (for now)
+- some info in trigger
+- rel 1, stbr (ac-test at last); status: ix86, x8666, ppc works, other don't
but builds
+
Revision 1.50 2005/11/04 19:55:22 sparky
- updated to yesterday snapshot (svn rev 252)
- fixed amd64, stupid vim syntax file, '#' in %ifnarch is not a comment
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/quake3.spec?r1=1.50&r2=1.51&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
